We always HAVE_CONFIG_H so don't bother checking whether we have it or not.

svn path=/trunk/; revision=45015

16 files changed, 9 insertions, 41 deletions

diff --git a/wsutil/airpdcap_wep.c b/wsutil/airpdcap_wep.c
index 29d7d44743..2ff4ca12b6 100644
--- a/wsutil/airpdcap_wep.c
+++ b/wsutil/airpdcap_wep.c
@@ -33,9 +33,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 /************************************************************************/
 /*	File includes							*/
diff --git a/wsutil/crc10.c b/wsutil/crc10.c
index 77d5068624..7a4b1c4c5f 100644
--- a/wsutil/crc10.c
+++ b/wsutil/crc10.c
@@ -21,9 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/wsutil/crc16.c b/wsutil/crc16.c
index 54aa6fda6c..f7a7a92b66 100644
--- a/wsutil/crc16.c
+++ b/wsutil/crc16.c
@@ -31,9 +31,7 @@
  *      DCEs using asynchronous-to-synchronous conversion", Para. 8.1.1.6.1
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <wsutil/crc16.h>
diff --git a/wsutil/crc32.c b/wsutil/crc32.c
index e98ab269e2..dbbe288d2d 100644
--- a/wsutil/crc32.c
+++ b/wsutil/crc32.c
@@ -27,9 +27,7 @@
  * Routine from Chris Waters
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <wsutil/crc32.h>
diff --git a/wsutil/crc6.c b/wsutil/crc6.c
index bdd97ae941..9b5e88eaed 100644
--- a/wsutil/crc6.c
+++ b/wsutil/crc6.c
@@ -23,9 +23,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include "crc6.h"
diff --git a/wsutil/crc7.c b/wsutil/crc7.c
index 4ed1410b3a..cf4d99d0ba 100644
--- a/wsutil/crc7.c
+++ b/wsutil/crc7.c
@@ -35,9 +35,7 @@
  *    ReflectOut   = False
  *    Algorithm    = table-driven
  *****************************************************************************/
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 #include "crc7.h"     /* include the header file generated with pycrc */
diff --git a/wsutil/crc8.c b/wsutil/crc8.c
index 6e344d1af0..420a635474 100644
--- a/wsutil/crc8.c
+++ b/wsutil/crc8.c
@@ -25,9 +25,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <wsutil/crc8.h>
diff --git a/wsutil/file_util.c b/wsutil/file_util.c
index a024496585..c9186c423d 100644
--- a/wsutil/file_util.c
+++ b/wsutil/file_util.c
@@ -34,9 +34,7 @@
 #error "This is only for Windows"
 #endif
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/wsutil/inet_aton.c b/wsutil/inet_aton.c
index 48bc84124c..6760d91246 100644
--- a/wsutil/inet_aton.c
+++ b/wsutil/inet_aton.c
@@ -27,9 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
diff --git a/wsutil/inet_ntop.c b/wsutil/inet_ntop.c
index 0e38365ad6..7258f4a481 100644
--- a/wsutil/inet_ntop.c
+++ b/wsutil/inet_ntop.c
@@ -18,9 +18,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/wsutil/inet_pton.c b/wsutil/inet_pton.c
index bfa2535f3e..67e3ea973f 100644
--- a/wsutil/inet_pton.c
+++ b/wsutil/inet_pton.c
@@ -17,9 +17,7 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/wsutil/privileges.c b/wsutil/privileges.c
index 039949c07b..4cb3e6b497 100644
--- a/wsutil/privileges.c
+++ b/wsutil/privileges.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #if defined(HAVE_SETRESUID) || defined(HAVE_SETREGUID)
 #define _GNU_SOURCE /* Otherwise [sg]etres[gu]id won't be defined on Linux */
diff --git a/wsutil/str_util.c b/wsutil/str_util.c
index d4fb3f34fc..065ca83d25 100644
--- a/wsutil/str_util.c
+++ b/wsutil/str_util.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include "str_util.h"
diff --git a/wsutil/strptime.c b/wsutil/strptime.c
index 626235f4d3..1680fa26a7 100644
--- a/wsutil/strptime.c
+++ b/wsutil/strptime.c
@@ -23,9 +23,7 @@
    some of them in the same format (such as year, week and weekday)
    this is enough information for determining the date.  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/wsutil/type_util.c b/wsutil/type_util.c
index 87a401f835..00318b7860 100644
--- a/wsutil/type_util.c
+++ b/wsutil/type_util.c
@@ -22,9 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include "type_util.h"
diff --git a/wsutil/wsgetopt.c b/wsutil/wsgetopt.c
index 8007268b91..44b71af209 100644
--- a/wsutil/wsgetopt.c
+++ b/wsutil/wsgetopt.c
@@ -30,9 +30,7 @@
 # define _NO_PROTO
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>