Commit b30aaafb authored by Emilia Kasper's avatar Emilia Kasper
Browse files

define inline for Visual Studio 

In Visual Studio, inline is available in C++ only, however __inline is available for C, see
http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarDr Stephen Henson <steve@openssl.org>
(cherry picked from commit f511b25a)

Conflicts:
	e_os.h
parent fee8d86d

e_os.h

+10 −2
Original line number Diff line number Diff line
@@ -360,7 +360,16 @@ static unsigned int _strlen31(const char *str) 
#    define DEFAULT_HOME  "C:"

#  endif



#else /* The non-microsoft world world */

/*

 * Visual Studio: inline is available in C++ only, however

 * __inline is available for C, see

 * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx

 */

#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline)

#  define inline __inline

#endif



#else /* The non-microsoft world */



#  ifdef OPENSSL_SYS_VMS

#    define VMS 1
@@ -707,4 +716,3 @@ struct servent *getservbyname(const char *name, const char *proto); 
#endif



#endif