symcat.h: Honor autoconf macro HAVE_STRINGIZE.

        * symcat.h: Honor autoconf macro HAVE_STRINGIZE.  Add
        comments/caveats with regard to traditional C behavior.

From-SVN: r33209

diff --git a/include/ChangeLog b/include/ChangeLog
index e2bf4c15cbef6c046bcfd49827dac289b74dd0f6..4be8ffb7c95f6ede0be59cf9600897a34830ec22 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * symcat.h: Honor autoconf macro HAVE_STRINGIZE.  Add
+       comments/caveats with regard to traditional C behavior.
+
 2000-04-05  Richard Henderson  <rth@cygnus.com>
 
        * splay-tree.h (splay_tree_remove): Declare.

diff --git a/include/symcat.h b/include/symcat.h
index 3e27162b26490ea46e72ad225fa667ee394af7c3..41589d42add58985f94ccd42e67887732839457d 100644 (file)
--- a/include/symcat.h
+++ b/include/symcat.h
@@ -19,12 +19,16 @@
 #ifndef SYM_CAT_H
 #define SYM_CAT_H
 
-#if defined (__STDC__) || defined (ALMOST_STDC)
+#if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
 #define CONCAT2(a,b)    a##b
 #define CONCAT3(a,b,c)  a##b##c
 #define CONCAT4(a,b,c,d) a##b##c##d
 #define STRINGX(s) #s
 #else
+/* Note one should never pass extra whitespace to the CONCATn macros,
+   e.g. CONCAT2(foo, bar) because traditonal C will keep the space between
+   the two labels instead of concatenating them.  Instead, make sure to
+   write CONCAT2(foo,bar).  */
 #define CONCAT2(a,b)    a/**/b
 #define CONCAT3(a,b,c)  a/**/b/**/c
 #define CONCAT4(a,b,c,d) a/**/b/**/c/**/d
@@ -35,6 +39,11 @@
 #define XCONCAT3(a,b,c)   CONCAT3(a,b,c)
 #define XCONCAT4(a,b,c,d) CONCAT4(a,b,c,d)
 
+/* Note the layer of indirection here is typically used to allow
+   stringification of the expansion of macros.  I.e. "#define foo
+   bar", "XSTRING(foo)", to yield "bar".  Be aware that this only
+   works for __STDC__, not for traditional C which will still resolve
+   to "foo".  */
 #define XSTRING(s) STRINGX(s) 
 
 #endif SYM_CAT_H