X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=e_os.h;h=d0217f1863cfb85e9e5f714a03f086da859e052e;hb=1904d21123849a65dafde1705e6dd5b7c2f420eb;hp=0e01b46574ae83c633198e19c77578b07b4e5417;hpb=40155f408985aff2e9f1b61b7cb04a3e518633a1;p=oweals%2Fopenssl.git

diff --git a/e_os.h b/e_os.h
index 0e01b46574..d0217f1863 100644
--- a/e_os.h
+++ b/e_os.h
@@ -274,7 +274,7 @@ extern "C" {
 #    ifdef _WIN64
 #      define strlen(s) _strlen31(s)
 /* cut strings to 2GB */
-static unsigned int _strlen31(const char *str)
+static __inline unsigned int _strlen31(const char *str)
 	{
 	unsigned int len=0;
 	while (*str && len<0x80000000U) str++, len++;
@@ -316,10 +316,8 @@ static unsigned int _strlen31(const char *str)
 #      endif
 #    endif
 #  endif
-#  if !defined(OPENSSL_FIPSCANISTER)
 #    include <io.h>
 #    include <fcntl.h>
-#  endif
 
 #  ifdef OPENSSL_SYS_WINCE
 #    define OPENSSL_NO_POSIX_IO
@@ -727,8 +725,8 @@ struct servent *getservbyname(const char *name, const char *proto);
 #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(__GNUC__) && __GNUC__>=2
+#  define inline __inline__
 # elif defined(_MSC_VER)
   /*
    * Visual Studio: inline is available in C++ only, however