RT3108: OPENSSL_NO_SOCK should imply OPENSSL_NO_DGRAM

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index 0a97895360d71407e2be33279641421728ac796e..27b18256b603aed9be9266f778593ec534e69bd9 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -379,7 +379,16 @@ static unsigned int _strlen31(const char *str)
 #  define check_winnt() (1)
 #else
 #  define check_winnt() (GetVersion() < 0x80000000)
-#endif 
+#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 */
 
@@ -490,6 +499,10 @@ static unsigned int _strlen31(const char *str)
 
 /*************/
 
+#if defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_DGRAM)
+#  define OPENSSL_NO_DGRAM
+#endif
+
 #ifdef USE_SOCKETS
 #  if defined(WINDOWS) || defined(MSDOS)
       /* windows world */
@@ -754,4 +767,3 @@ struct servent *getservbyname(const char *name, const char *proto);
 #endif
 
 #endif
-