diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-10 16:31:58 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-09-10 16:31:58 +0000 |
| commit | b1e05575207274d02fc5ece967ad827fb641a5e9 (patch) | |
| tree | fb6ff663ac47b301d90f3cea43a89aa9b2814c3e /lib/libcrypto/aes | |
| parent | bfd6188e26175478899b35f39b00ee6c3e967efe (diff) | |
merge openssl-0.9.7-beta3, tested on vax by miod@
Diffstat (limited to 'lib/libcrypto/aes')
| -rw-r--r-- | lib/libcrypto/aes/Makefile.ssl | 2 | ||||
| -rw-r--r-- | lib/libcrypto/aes/aes_locl.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/libcrypto/aes/Makefile.ssl b/lib/libcrypto/aes/Makefile.ssl index aa16bbee2a4..9358802a2e5 100644 --- a/lib/libcrypto/aes/Makefile.ssl +++ b/lib/libcrypto/aes/Makefile.ssl @@ -75,7 +75,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/lib/libcrypto/aes/aes_locl.h b/lib/libcrypto/aes/aes_locl.h index 541d1d6e845..18fc2d07476 100644 --- a/lib/libcrypto/aes/aes_locl.h +++ b/lib/libcrypto/aes/aes_locl.h @@ -60,10 +60,7 @@ #include <stdio.h> #include <stdlib.h> - -#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS) #include <string.h> -#endif #ifdef _MSC_VER # define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) |