summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e_os.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/e_os.h b/e_os.h
index 200df42668..13694c457d 100644
--- a/e_os.h
+++ b/e_os.h
@@ -293,7 +293,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++;
@@ -742,8 +742,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