From e92ef179a31b2357ec1dcec634767d7d1eed97e3 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 12 Aug 2021 20:43:00 -0400 Subject: [PATCH] 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. --- NEWS | 3 +++ configure.ac | 2 +- src/error.c | 6 +++--- src/i18n.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 97b04bf..782a8f2 100644 --- 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 711f939..0784644 100644 --- 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 9a91e4e..fe0695c 100644 --- a/src/error.c +++ b/src/error.c @@ -23,12 +23,12 @@ #include #include -#include -#include - #include "cdecl.h" #include "cdecl-internal.h" +#include +#include + gl_once_define(static, tls_initialized); static gl_tls_key_t tls_key; diff --git a/src/i18n.c b/src/i18n.c index 476386e..72bfc23 100644 --- a/src/i18n.c +++ b/src/i18n.c @@ -19,10 +19,11 @@ #include #include #include -#include #include "cdecl-internal.h" +#include + static void initialize(void) { bindtextdomain(PACKAGE, LOCALEDIR); -- 2.43.0