index a034407514eeaa292dd8e68df4f2b1ba437a7097..af55ae5b9ddde0513245ba59e817943e7a400290 100644 (file)
2008年04月14日 Eric Blake <ebb9@byu.net>
+ Improve OS/2 detection.
+ * modules/gnu.c (m4_macro_table): Ensure all possible identifiers
+ are defined, not just the first. The testsuite ensures that
+ exactly one gets defined.
+ * m4/system_.h [__EMX__]: OS/2 is not Unix-compatible, no matter
+ what other pre-defined macros it has.
+ * THANKS: Update.
+ Reported by Elbert Pol.
+
Ensure __m4_version__ is unquoted.
* tests/builtins.at (__m4_@&t@version__): Augment test.
index 6c8bedd2f50b96b704c3581ff075efd04f6dc1be..6d476d32c9a2a425228433c66019e31f988f641d 100644 (file)
@@ -37,6 +37,7 @@ Dan Jacobson jidanni@jidanni.org
Daniel Richard G. skunk@iskunk.org
David J. MacKenzie djm@uunet.uu.net
David Perlin davep@nanosoft.com
+Elbert Pol elbert.pol@gmail.com
Erez Zadok ezk@cs.columbia.edu
Eric Allman eric@cs.berkeley.edu
Eric Backus ericb@lsid.hp.com
@@ -78,6 +79,7 @@ Keith Bostic bostic@abyssinian.sleepycat.com
Konrad Schwarz konrad.schwarz@siemens.com
Kristine Lund lund@lpnaxp.in2p3.fr
Krste Asanovic krste@icsi.berkeley.edu
+Lawson Chan Lawson.Chan@tdsecurities.com
M. Levinson levinsm@users.sourceforge.net
Marcus Daniels marcus@ee.pdx.edu
Marion Hakanson hakanson@cse.ogi.edu
index f1e960245edad470c3d0b8ffd5920560bbfe336a..2c9e1a7c9eaa9391202714c828cdd5a36e0b8a69 100644 (file)
/* GNU m4 -- A simple macro processor
- Copyright (C) 2000, 2001, 2003, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001, 2003, 2006, 2007, 2008 Free Software
+ Foundation, Inc.
This file is part of GNU M4.
/* Canonicalize OS/2 recognition macro. */
#ifdef __EMX__
# define OS2 1
+# undef UNIX
#endif
\f
index 1cf4a600fe887bcce19101ee2a92b0bd6a20cb1a..b481581af203449d463492c9c26aaa4e2a5fe56e 100644 (file)
/* name text min max */
#if UNIX
{ "__unix__", "", 0, 0 },
-#elif W32_NATIVE
+#endif
+#if W32_NATIVE
{ "__windows__", "", 0, 0 },
-#elif OS2
+#endif
+#if OS2
{ "__os2__", "", 0, 0 },
-#else
-# warning Platform macro not provided
#endif
{ "__gnu__", "", 0, 0 },
{ "__m4_version__", VERSION,0, 0 },