Commit af32df0a authored by Andy Polyakov's avatar Andy Polyakov Committed by Emilia Kasper
Browse files

e_os.h: allow inline functions to be compiled by legacy compilers. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 40155f40)

Conflicts:
	e_os.h
parent bfb7bf1a

e_os.h

+17 −9
Original line number Diff line number Diff line
@@ -360,15 +360,6 @@ static unsigned int _strlen31(const char *str) 
#    define DEFAULT_HOME  "C:"

#  endif



/*

 * 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
@@ -711,6 +702,23 @@ struct servent *getservbyname(const char *name, const char *proto); 
#endif

/* end vxworks */



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

# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L

   /* do nothing, inline works */

# elif defined(__GNUC__) && __GNUC__>=3 && !defined(__NO_INLINE__)

   /* do nothing, inline works */

# elif defined(_MSC_VER)

  /*

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

   * __inline is available for C, see

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

   */

#  define inline __inline

# else

#  define inline

# endif

#endif



#ifdef  __cplusplus

}

#endif