Include glthread headers late.

It seems that in some configurations, the glthread headers can
include Windows headers which define macros that can conflict
with the libcdecl headers.

As the damage appears to be isolated to the headers, re-ordering
the includes appears to be sufficient to avoid any problems, at
least within the library.

diff --git a/NEWS b/NEWS
index 97b04bf016e954ab88e6e7707b9e196473c8dcb9..782a8f29061de4e4bd48e1775354df963a5baa74 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Release 1.1a:
+       * Various bug fixes and improvements.
+
 Release 1.1:
        * Error messages are no longer printed by libcdecl.
        * Various bug fixes and improvements.

diff --git a/configure.ac b/configure.ac
index 711f939cf88836b18cc4fd1bae0f847518161516..0784644ab20d89d9cb9013c384abe9b252f65acd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
 AC_PREREQ([2.68])
-AC_INIT([cdecl99], [1.1], [nbowler@draconx.ca])
+AC_INIT([cdecl99], [1.1a], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz])

diff --git a/src/error.c b/src/error.c
index 9a91e4e451c6d9ca01870b890e4f35f80e5acaf1..fe0695c263ab9e45786b2a75b597bf1a4657c963 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -23,12 +23,12 @@
 #include <assert.h>
 #include <stdarg.h>
 
-#include <glthread/lock.h>
-#include <glthread/tls.h>
-
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
+#include <glthread/lock.h>
+#include <glthread/tls.h>
+
 gl_once_define(static, tls_initialized);
 static gl_tls_key_t tls_key;
 

diff --git a/src/i18n.c b/src/i18n.c
index 476386e40b084cd8b2f8d07d762bec42d951e760..72bfc23de43b41807bedc865939218c0c5f01510 100644 (file)
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -19,10 +19,11 @@
 #include <config.h>
 #include <stdio.h>
 #include <assert.h>
-#include <glthread/lock.h>
 
 #include "cdecl-internal.h"
 
+#include <glthread/lock.h>
+
 static void initialize(void)
 {
        bindtextdomain(PACKAGE, LOCALEDIR);