summaryrefslogtreecommitdiffstats
path: root/crypto/cast
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>1999-05-20 21:59:20 +0000
committerBodo Möller <bodo@openssl.org>1999-05-20 21:59:20 +0000
commit17e3dd1c62e9aadcd908c55e650f70379d2d19e2 (patch)
tree2b3191cc15e24d09853b7e1b708fd93a398b40e8 /crypto/cast
parent9dff4cc05100b9989998e4fe061e58d0fbfd6d8e (diff)
Don't install e_os.h in include/openssl, use it only as a local
include file.
Diffstat (limited to 'crypto/cast')
-rw-r--r--crypto/cast/Makefile.ssl21
-rw-r--r--crypto/cast/cast_lcl.h7
2 files changed, 16 insertions, 12 deletions
diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl
index 4c3256b0d1..8c2f34cf43 100644
--- a/crypto/cast/Makefile.ssl
+++ b/crypto/cast/Makefile.ssl
@@ -107,14 +107,13 @@ clean:
# DO NOT DELETE THIS LINE -- make depend depends on it.
-c_cfb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
-c_cfb64.o: ../../include/openssl/e_os2.h cast_lcl.h
-c_ecb.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
-c_ecb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslv.h
-c_ecb.o: cast_lcl.h
-c_enc.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
-c_enc.o: ../../include/openssl/e_os2.h cast_lcl.h
-c_ofb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
-c_ofb64.o: ../../include/openssl/e_os2.h cast_lcl.h
-c_skey.o: ../../include/openssl/cast.h ../../include/openssl/e_os.h
-c_skey.o: ../../include/openssl/e_os2.h cast_lcl.h cast_s.h
+c_cfb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h
+c_cfb64.o: cast_lcl.h
+c_ecb.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h
+c_ecb.o: ../../include/openssl/opensslv.h ../e_os.h cast_lcl.h
+c_enc.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h
+c_enc.o: cast_lcl.h
+c_ofb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h
+c_ofb64.o: cast_lcl.h
+c_skey.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h
+c_skey.o: cast_lcl.h cast_s.h
diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h
index 2694bc4441..9f3a6602c9 100644
--- a/crypto/cast/cast_lcl.h
+++ b/crypto/cast/cast_lcl.h
@@ -60,7 +60,12 @@
#include <stdlib.h>
#endif
-#include <openssl/e_os.h> /* OPENSSL_EXTERN */
+/* we need OPENSSL_EXTERN from e_os.h */
+#ifndef FLAT_INC
+# include "../e_os.h"
+#else
+# include "e_os.h"
+#endif
#undef c2l
#define c2l(c,l) (l =((unsigned long)(*((c)++))) , \