From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 12 Aug 2005 11:00:13 +0000 (+0000)
Subject: Protect config.h include.
X-Git-Tag: gnutls_1_2_7~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d950f80dcb8e80f2282f62d70f43efb6466bd7;p=thirdparty%2Fgnutls.git

Protect config.h include.
Assume C89 platform.
---

diff --git a/lib/defines.h b/lib/defines.h
index f071cee56f..21cedc0fbf 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -25,15 +25,16 @@
 #ifndef DEFINES_H
 # define DEFINES_H
 
-#include <config.h>
-
-#ifdef STDC_HEADERS
-# include <string.h>
-# include <stdlib.h>
-# include <stdio.h>
-# include <ctype.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
 #ifdef NO_SSIZE_T
 # define HAVE_SSIZE_T
 typedef int ssize_t;
@@ -43,12 +44,6 @@ typedef int ssize_t;
 # include <strings.h>
 #endif
 
-#include <memmem.h>
-
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -76,6 +71,8 @@ typedef int ssize_t;
 # include <sys/socket.h>
 #endif
 
+#include "memmem.h"
+
 #ifndef HAVE_UINT
 typedef unsigned int uint;
 typedef signed int sint;