e_os.h: don't do double work with status codes.

openssl.c: make damn sure e_os.h knows about OPENSSL_C

diff --git a/apps/openssl.c b/apps/openssl.c
index 9ddd5364540f534bb694f382f14f6b46d1ac1b20..934a1c176d42559fa4cc0cb0198194da4b72ae06 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
@@ -67,7 +68,6 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
-#define OPENSSL_C /* tells apps.h to use complete apps_startup() */
 #include "apps.h"
 #include "progs.h"
 #include "s_apps.h"

diff --git a/e_os.h b/e_os.h
index 3eff833efb13ece7d8701bd3e9d1e4d60a039129..f5bcceb8acc89ec4027e0346714bbd4184440cfc 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -271,13 +271,7 @@ extern "C" {
                                     exit(__VMS_EXIT); \
                                     return(__VMS_EXIT); } while(0)
 #    else
-#      define EXIT(n)          do { int __VMS_EXIT = n; \
-                                     if (__VMS_EXIT == 0) \
-                                      __VMS_EXIT = 1; \
-                                    else \
-                                      __VMS_EXIT = (n << 3) | 2; \
-                                     __VMS_EXIT |= 0x10000000; \
-                                    return(__VMS_EXIT); } while(0)
+#      define EXIT(n)          return(n)
 #    endif
 #    define NO_SYS_PARAM_H
 #  else