summaryrefslogtreecommitdiffstats
path: root/apps/s_apps.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-11-28 13:10:58 +0000
committerRichard Levitte <levitte@openssl.org>2003-11-28 13:10:58 +0000
commit4d8743f490a5f96fa26d41985ee12cb6b9815a4c (patch)
tree9668a30c8c9bcc3347eddb5b553d8f1c6ccc8524 /apps/s_apps.h
parent4c8b4f9d03fb5db99fa22b235369b96039f60706 (diff)
Netware-specific changes,
PR: 780 Submitted by: Verdon Walker <VWalker@novell.com> Reviewed by: Richard Levitte
Diffstat (limited to 'apps/s_apps.h')
-rw-r--r--apps/s_apps.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h
index 66b6edd442..f4c85aa81f 100644
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -108,8 +108,9 @@
* Hudson (tjh@cryptsoft.com).
*
*/
-
+#if !defined(OPENSSL_SYS_NETWARE) /* conflicts with winsock2 stuff on netware */
#include <sys/types.h>
+#endif
#include <openssl/opensslconf.h>
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)