aboutsummaryrefslogtreecommitdiffstats
path: root/e_os.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-12-22 16:07:24 +0000
committerDr. Stephen Henson <steve@openssl.org>2015-12-22 23:03:56 +0000
commit80e0ecbf580e1455cdd6ccdb6f8f918295dca81c (patch)
tree50318df21783d5e04f50d8be04b066ec518fb0b7 /e_os.h
parent02a60ae28fe87504d689223c1f5bb558bea6842d (diff)
downloadopenssl-80e0ecbf580e1455cdd6ccdb6f8f918295dca81c.tar.gz
Add ossl_inline
Add macro ossl_inline for use in public headers where a portable inline is required. Change existing inline to use ossl_inline Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'e_os.h')
-rw-r--r--e_os.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/e_os.h b/e_os.h
index 2832f308e7..5ab4c89a70 100644
--- a/e_os.h
+++ b/e_os.h
@@ -654,23 +654,6 @@ 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__>=2
-# define inline __inline__
-# 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
-
#define OSSL_NELEM(x) (sizeof(x)/sizeof(x[0]))
#ifdef __cplusplus