diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2014-06-06 18:25:31 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2014-06-06 18:25:31 -0400 |
| commit | 4d3ae034b7c02b6a94e04ec7a32582379b6f4716 (patch) | |
| tree | fa5b083d20e4052973b17e0e074c5ecdafbea250 | |
| parent | 8540f6d2a74fe9d67440535ebbcfa252180a3172 (diff) | |
| download | glibc-4d3ae034b7c02b6a94e04ec7a32582379b6f4716.tar.gz glibc-4d3ae034b7c02b6a94e04ec7a32582379b6f4716.tar.xz glibc-4d3ae034b7c02b6a94e04ec7a32582379b6f4716.zip | |
crypt: don't include ufc-crypt.h multiple times
The file has no inclusion guards, and contains typedefs that cause errors when included multiple times with older (pre-C11) compilers such as gcc 4.4. Save the "#ifdef DOS" content to crypt-private.h even though it's likely not particularly useful.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | crypt/crypt-entry.c | 10 | ||||
| -rw-r--r-- | crypt/crypt-private.h | 9 | ||||
| -rw-r--r-- | crypt/crypt.c | 2 | ||||
| -rw-r--r-- | crypt/crypt_util.c | 11 |
5 files changed, 17 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index 4baa8455ce..38210961a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-06 Chris Metcalf <cmetcalf@tilera.com> + + * crypt/crypt-private.h [DOS]: Add some includes taken from the + other files in the crypt directory. + * crypt/crypt.c: Remove duplicate includes. + * crypt/crypt-entry.c: Likewise. + * crypt/crypt_util.c: Likewise. + 2014-06-06 Joseph Myers <joseph@codesourcery.com> * Makeconfig (run-program-env): New variable. diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c index 2a6e9504e3..f6444dfc14 100644 --- a/crypt/crypt-entry.c +++ b/crypt/crypt-entry.c @@ -34,16 +34,6 @@ #define STATIC static #endif -#ifndef DOS -#include "ufc-crypt.h" -#else -/* - * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein) - * for DOS patches - */ -#include "ufc.h" -#endif -#include "crypt.h" #include "crypt-private.h" /* Prototypes for local functions. */ diff --git a/crypt/crypt-private.h b/crypt/crypt-private.h index ea46a7f949..b6a5e07b36 100644 --- a/crypt/crypt-private.h +++ b/crypt/crypt-private.h @@ -28,7 +28,16 @@ #include <features.h> #include <stdbool.h> +#ifndef DOS #include "ufc-crypt.h" +#else +/* + * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein) + * for DOS patches + */ +#include "pl.h" +#include "ufc.h" +#endif #include "crypt.h" /* crypt.c */ diff --git a/crypt/crypt.c b/crypt/crypt.c index 4fb25780fc..1919210daf 100644 --- a/crypt/crypt.c +++ b/crypt/crypt.c @@ -23,8 +23,6 @@ * */ -#include "ufc-crypt.h" -#include "crypt.h" #include "crypt-private.h" #ifdef _UFC_32_ diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c index 9381d67194..da0a5aa33b 100644 --- a/crypt/crypt_util.c +++ b/crypt/crypt_util.c @@ -33,17 +33,6 @@ #define STATIC static #endif -#ifndef DOS -#include "ufc-crypt.h" -#else -/* - * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein) - * for DOS patches - */ -#include "pl.h" -#include "ufc.h" -#endif -#include "crypt.h" #include "crypt-private.h" /* Prototypes for local functions. */ |