diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-05-21 13:16:48 +0200 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-05-21 13:16:48 +0200 |
| commit | 7e701817234ff2be2a745fc63f32ccb5e874854c (patch) | |
| tree | 9fabfb74c7cfdd98d897ce0f0f43efe42996b9d9 /crypto/cast | |
| parent | Don't include top-level CVS directory. (diff) | |
| download | openssl-7e701817234ff2be2a745fc63f32ccb5e874854c.tar.xz openssl-7e701817234ff2be2a745fc63f32ccb5e874854c.zip | |
It was a very bad idea to use #include "../e_os.h" -- when this occurs
in cryptlib.h (which is often included as "../cryptlib.h"), then the
question remains relative to which directory this is to be interpreted.
gcc went one further directory up, as intended; but makedepend thinks
differently, and so probably do some C compilers. So the ../ must go away;
thus e_os.h goes back into include/openssl (but I now use
#include "openssl/e_os.h" instead of <openssl/e_os.h> to make the point) --
and we have another huge bunch of dependency changes. Argh.
Diffstat (limited to 'crypto/cast')
| -rw-r--r-- | crypto/cast/Makefile.ssl | 10 | ||||
| -rw-r--r-- | crypto/cast/cast_lcl.h | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl index d72f646b59..4c3256b0d1 100644 --- a/crypto/cast/Makefile.ssl +++ b/crypto/cast/Makefile.ssl @@ -107,14 +107,14 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -c_cfb64.o: ../../e_os.h ../../include/openssl/cast.h +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: ../../e_os.h ../../include/openssl/cast.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: ../../e_os.h ../../include/openssl/cast.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: ../../e_os.h ../../include/openssl/cast.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: ../../e_os.h ../../include/openssl/cast.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 diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h index 98be7184f8..83cf382a91 100644 --- a/crypto/cast/cast_lcl.h +++ b/crypto/cast/cast_lcl.h @@ -60,12 +60,8 @@ #include <stdlib.h> #endif -/* we need OPENSSL_EXTERN from e_os.h */ -#ifndef FLAT_INC -# include "../../e_os.h" -#else -# include "e_os.h" -#endif + +#include "openssl/e_os.h" /* OPENSSL_EXTERN */ #undef c2l #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ |