Include config.h first. Tiny patch from Albert Chin <gnutls-dev@mlists.thewrittenwor...

diff --git a/lib/debug.c b/lib/debug.c
index a9f18d0c1149a4f45e0e1a4e3d5a32deb7ca3601..ee2e220f860b8275015a1ad91bb7faabbec8d93d 100644 (file)
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -22,10 +22,10 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "gnutls_int.h"
 #include "gnutls_errors.h"
+#include <stdio.h>
+#include <stdlib.h>
 #include <gcrypt.h>
 
 #ifdef DEBUG

diff --git a/lib/x509/common.c b/lib/x509/common.c
index ae707c2afcc2a95f66a6b1c3b865df14390c5f50..c361e79b3fad065ea73773172040a55dce1ed821 100644 (file)
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 #include <gnutls_datum.h>
 #include <gnutls_global.h>
 #include <gnutls_errors.h>

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 3fd0431dbf02260635be7031cb74a0a8a865827d..249848e4a478766bcda6377282ca0a44e86f0bfd 100644 (file)
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 
 #ifdef ENABLE_PKI
 

diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index c8b28c5fb3cb367e628ea0a2a1aded7801988f53..819e369900d7aaf67080375b36f87924f4715778 100644 (file)
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -22,8 +22,8 @@
  *
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 #include <gnutls_datum.h>
 #include <gnutls_global.h>
 #include <gnutls_errors.h>

diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index 78de1c24c13fecc7f94c09e0b1db1baafc44fd05..a1abbc0b4e86643194aa44844c7e434d1654087c 100644 (file)
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -25,8 +25,8 @@
 /* Functions that relate on PKCS12 packet parsing.
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 
 #ifdef ENABLE_PKI
 

diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 6a915bef6b25e31068dc4715deb27308c31ff86b..a73d1909bcabdd9ca681a614fb44f8284b565d1b 100644 (file)
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -25,8 +25,8 @@
 /* Functions that relate on PKCS7 certificate lists parsing.
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 
 #ifdef ENABLE_PKI
 

diff --git a/libextra/openssl_compat.c b/libextra/openssl_compat.c
index 6e4ce9a738543b55e78d0fe7d4a2bb089a1cc30e..f28c84d2b18586f6f2ec3c984bfa8f443b964945 100644 (file)
--- a/libextra/openssl_compat.c
+++ b/libextra/openssl_compat.c
@@ -27,6 +27,8 @@
  * API.
  */
 
+#include <config.h>
+
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
 #include <string.h>            /* memset */

diff --git a/src/serv.c b/src/serv.c
index a547ea0f99a65b41e19ee6d24208a91838c24294..83ceb7b96591da6bcb04a8522c0a2ecfd68f82d7 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -24,6 +24,8 @@
  * (which means it is quite unreadable)
  */
 
+#include "common.h"
+#include "serv-gaa.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -31,11 +33,8 @@
 #include <string.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/extra.h>
-#include "common.h"
-#include "serv-gaa.h"
 #include <sys/time.h>
 #include <fcntl.h>
-#include <config.h>
 #include <list.h>
 
 /* konqueror cannot handle sending the page in multiple