removed useless g_string(x) macro that cluttered the namespace and was

Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>

        * glib.h: removed useless g_string(x) macro that cluttered the namespace
        and was just a poor wrapper around the cpp '#' symbol, use #x if you
        need to work around this.
        added new macro G_STRINGIFY(arg) that will convert arg to a string,
        no matter whether it contains macros or not.

diff --git a/ChangeLog b/ChangeLog
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0d4652ab1646685f157a5e84b40452843a9ddc85..5502212a41c5cde366042c8e822c43feddcb2fdc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Oct 12 14:17:12 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h: removed useless g_string(x) macro that cluttered the namespace
+       and was just a poor wrapper around the cpp '#' symbol, use #x if you
+       need to work around this.
+       added new macro G_STRINGIFY(arg) that will convert arg to a string,
+       no matter whether it contains macros or not.
+
 1999-10-12  Tor Lillqvist  <tml@iki.fi>
 
        * config.h.win32.in: Define the new GLIB_SIZEOF_* constants here,

diff --git a/NEWS b/NEWS
index 18531dcc2a63bea524b99fa59864d98bdeeb5bb7..022acd563bf4f0e0ff0764bd17d808146f03ccb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,8 @@ What's new in GLib 1.3.1:
 * New thread-safe random number generator Mersenne Twister.
 * g_strcompress() added, g_strescape() had a slight API change, and
   more tightly defined semantics.
-
+* the g_string(x) macro has been removed, #x may be used instead.
+                                
 Overview of Changes in GLib 1.2.1:
 
 * g_realloc() fix for SunOS (please report further problems).

diff --git a/glib.h b/glib.h
index 1eac04ab206d11e690a80c2678b5ab33ea5ade74..d88cef646944d5c3e2ca30e07a3c8301ae79cb4e 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -131,6 +131,9 @@ extern "C" {
 #undef CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
+#define G_STRINGIFY(macro_or_string)   G_STRINGIFY_ARG (macro_or_string)
+#define        G_STRINGIFY_ARG(contents)       #contents
+
 
 /* Define G_VA_COPY() to do the right thing for copying va_list variables.
  * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
@@ -326,9 +329,6 @@ extern "C" {
 } G_STMT_END
 
 
-#define g_string(x) #x
-
-
 /* Provide macros for error handling. The "assert" macros will
  *  exit on failure. The "return" macros will exit the current
  *  function. Two different definitions are given for the macros

diff --git a/glib/glib.h b/glib/glib.h
index 1eac04ab206d11e690a80c2678b5ab33ea5ade74..d88cef646944d5c3e2ca30e07a3c8301ae79cb4e 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -131,6 +131,9 @@ extern "C" {
 #undef CLAMP
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 
+#define G_STRINGIFY(macro_or_string)   G_STRINGIFY_ARG (macro_or_string)
+#define        G_STRINGIFY_ARG(contents)       #contents
+
 
 /* Define G_VA_COPY() to do the right thing for copying va_list variables.
  * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
@@ -326,9 +329,6 @@ extern "C" {
 } G_STMT_END
 
 
-#define g_string(x) #x
-
-
 /* Provide macros for error handling. The "assert" macros will
  *  exit on failure. The "return" macros will exit the current
  *  function. Two different definitions are given for the macros