summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2000-03-18 09:09:31 +0000
committerRichard Levitte <levitte@openssl.org>2000-03-18 09:09:31 +0000
commit1f515cfe093ecbad58c786064439604b42c1e659 (patch)
tree83519f5e1938b8c97e72c691df5c1f1802603447
parentee7f80c580507a86baa9d07cc05af9e09de2bcb2 (diff)
e_os.h: don't do double work with status codes.
openssl.c: make damn sure e_os.h knows about OPENSSL_C
-rw-r--r--apps/openssl.c2
-rw-r--r--e_os.h8
2 files changed, 2 insertions, 8 deletions
diff --git a/apps/openssl.c b/apps/openssl.c
index 9ddd536454..934a1c176d 100644
--- 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 3eff833efb..f5bcceb8ac 100644
--- 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