[gnutls-dev] 1.2.9 patches to include <config.h> first

Albert Chin gnutls-dev at mlists.thewrittenword.com
Mon Nov 14 17:22:42 CET 2005


If using config.h or equivalent, you should always include it first in
case any of the #defines override something in /usr/include.

-- 
albert chin (china at thewrittenword.com)

-- snip snip
Index: lib/x509/common.c
===================================================================
--- lib/x509/common.c.orig	2005-11-12 21:44:49.713887000 -0600
+++ lib/x509/common.c	2005-11-12 21:44:58.930231000 -0600
@@ -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>
Index: lib/x509/crl.c
===================================================================
--- lib/x509/crl.c.orig	2005-11-12 21:44:49.665650000 -0600
+++ lib/x509/crl.c	2005-11-12 21:44:58.976507000 -0600
@@ -22,8 +22,8 @@
  *
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 
 #ifdef ENABLE_PKI
 
Index: lib/x509/dn.c
===================================================================
--- lib/x509/dn.c.orig	2005-11-12 21:44:49.689758000 -0600
+++ lib/x509/dn.c	2005-11-12 21:44:59.013661000 -0600
@@ -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>
Index: lib/x509/pkcs12.c
===================================================================
--- lib/x509/pkcs12.c.orig	2005-11-12 21:44:49.762140000 -0600
+++ lib/x509/pkcs12.c	2005-11-12 21:44:59.055856000 -0600
@@ -25,8 +25,8 @@
 /* Functions that relate on PKCS12 packet parsing.
  */
 
-#include <libtasn1.h>
 #include <gnutls_int.h>
+#include <libtasn1.h>
 
 #ifdef ENABLE_PKI
 
Index: lib/x509/pkcs7.c
===================================================================
--- lib/x509/pkcs7.c.orig	2005-11-12 21:44:49.738011000 -0600
+++ lib/x509/pkcs7.c	2005-11-12 21:44:59.104202000 -0600
@@ -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
 
Index: lib/debug.c
===================================================================
--- lib/debug.c.orig	2005-11-12 21:44:49.834522000 -0600
+++ lib/debug.c	2005-11-12 21:44:59.210421000 -0600
@@ -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
Index: src/serv.c
===================================================================
--- src/serv.c.orig	2005-11-12 21:44:50.075801000 -0600
+++ src/serv.c	2005-11-12 21:44:59.839353000 -0600
@@ -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
Index: libextra/openssl_compat.c
===================================================================
--- libextra/openssl_compat.c.orig	2005-05-26 10:19:59.000000000 -0500
+++ libextra/openssl_compat.c	2005-11-13 10:39:47.625789000 -0600
@@ -27,6 +27,8 @@
  * API.
  */
 
+#include <config.h>
+
 #include <gnutls_global.h>
 #include <gnutls_errors.h>
 #include <string.h>		/* memset */



More information about the Gnutls-dev mailing list