summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2012-04-07 23:00:32 -0700
committerKaz Kylheku <kaz@kylheku.com>2012-04-07 23:00:32 -0700
commitaf0a5387b31eec10f6660bc926e696e45f5ec756 (patch)
tree7486d88218f0925e3552d9b892c368d4afed97f5
parent1171e7042fbcedb95eecda2856275fc2a119b212 (diff)
downloadtxr-af0a5387b31eec10f6660bc926e696e45f5ec756.tar.gz
txr-af0a5387b31eec10f6660bc926e696e45f5ec756.tar.bz2
txr-af0a5387b31eec10f6660bc926e696e45f5ec756.zip
* lib.c: Revert earlier change: config.h must be included before the
<windows.h> section because that header is conditionally included based on one of the config constants.
-rw-r--r--ChangeLog6
-rw-r--r--lib.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index abedc1ed..2c06987f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2012-04-07 Kaz Kylheku <kaz@kylheku.com>
+ * lib.c: Revert earlier change: config.h must be included before the
+ <windows.h> section because that header is conditionally included
+ based on one of the config constants.
+
+2012-04-07 Kaz Kylheku <kaz@kylheku.com>
+
Fixes to get configure ccname=g++ working on OSX Lion.
* Makefile (conftest.syms): Use -n flag in nm so that the output
diff --git a/lib.c b/lib.c
index 30ac7d8d..51c584b0 100644
--- a/lib.c
+++ b/lib.c
@@ -36,11 +36,11 @@
#include <errno.h>
#include <wchar.h>
#include <math.h>
+#include "config.h"
#ifdef HAVE_GETENVIRONMENTSTRINGS
#define NOMINMAX
#include <windows.h>
#endif
-#include "config.h"
#include "lib.h"
#include "gc.h"
#include "arith.h"