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.

diff --git a/ChangeLog b/ChangeLog
index 4baa8455ce33cdc613b216be30d055f7252c3f98..38210961a234e6711b727c69e9545d47602dfc03 100644 (file)
--- 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 2a6e9504e3650373b30ae15a2608d119dcc502b8..f6444dfc14dea7a50681aa77bca63fd823476838 100644 (file)
--- 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 ea46a7f949cd4aa8745659bd1534026f024ea971..b6a5e07b369efed12ac054baf10bb9d3e928a35d 100644 (file)
--- 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 4fb25780fc8ad590fd25c990055e228d75e0e26a..1919210daf2b150ccc4b2e867f4c7e9ed6694b76 100644 (file)
--- 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 9381d671940b15d24154b9b2761be462c225ba38..da0a5aa33b8375484d2cbf7777212e311be8b8d7 100644 (file)
--- 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.  */