2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41196c0b..7ce24b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* getopt.c [DJGPP]: Change to __DJGPP__.
 	* mbsupport.h [DJGPP]: Change to __DJGPP__.
 
+	Unrelated:
+
+	* awk.h: Workarounds for _TANDEM_SOURCE.
+
 2012-05-01         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* dfa.c: Sync with GNU grep. RRI code now there, needed additional
diff --git a/awk.h b/awk.h
index 3574e587..89072619 100644
--- a/awk.h
+++ b/awk.h
@@ -30,6 +30,15 @@
  * any system headers.  Otherwise, extreme death, destruction
  * and loss of life results.
  */
+#if defined(_TANDEM_SOURCE)
+/*
+ * config.h forces this even on non-tandem systems but it
+ * causes problems elsewhere if used in the check below.
+ * so workaround it. bleah.
+ */
+#define tandem_for_real	1
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -38,7 +47,7 @@
 #define _GNU_SOURCE	1	/* enable GNU extensions */
 #endif /* _GNU_SOURCE */
 
-#if defined(_TANDEM_SOURCE) && ! defined(_SCO_DS)
+#if defined(tandem_for_real) && ! defined(_SCO_DS)
 #define _XOPEN_SOURCE_EXTENDED 1
 #endif