X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=e_os.h;h=19f085682cdeae84b97f56a2384c7f854e95bf40;hb=67fec850e1ccbbe921648b7f0b7ebeb4f1c084f6;hp=803ceae90e57067ed8fccd2c52ec38e0bdf8678c;hpb=3bfd99bfbbcd7e79cad39ecadb4e4378ef7ee14d;p=openssl.git

diff --git a/e_os.h b/e_os.h
index 803ceae90e..19f085682c 100644
--- a/e_os.h
+++ b/e_os.h
@@ -418,13 +418,10 @@ extern HINSTANCE _hInstance;
 #  endif
 #endif
 
-#if defined(OPENSSL_THREADS) || defined(sun)
-#ifndef _REENTRANT
-#define _REENTRANT
-#endif
-#endif
-
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
+  /* include headers first, so our defines don't break it */
+#include <stdlib.h>
+#include <string.h>
   /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
 # define memmove(s1,s2,n) bcopy((s2),(s1),(n))
 # define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))