define NULL as (0L) if __cplusplus is defined, to avoid "ANSI C++ forbids

Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>

        * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
        avoid "ANSI C++ forbids implicit conversion from `void *' in argument
        passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
        for erroring out on this, instead of just issueing a warning).

        * glib.h (g_trash_stack_pop): use uncasted NULL again.

diff --git a/ChangeLog b/ChangeLog
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 08bca22..0962bd9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Wed Sep 22 01:53:18 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (NULL): define NULL as (0L) if __cplusplus is defined, to
+       avoid "ANSI C++ forbids implicit conversion from `void *' in argument
+       passing" errors upon NULL usage in C++ programs (gcc-2.95 is on crack
+       for erroring out on this, instead of just issueing a warning).
+
+       * glib.h (g_trash_stack_pop): use uncasted NULL again.
+       
 Fri Sep 17 10:24:45 1999  Tim Janik  <timj@gtk.org>
 
        * gmem.c (g_mem_chunk_compute_size) (g_mem_chunk_new): applied patch

diff --git a/glib.h b/glib.h
index b85bec2..41b9477 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -103,8 +103,12 @@ extern "C" {
  *  been defined. It is assumed that if they are already
  *  defined then the current definition is correct.
  */
-#ifndef        NULL
-#define        NULL    ((void*) 0)
+#ifndef NULL
+#  ifdef __cplusplus
+#    define NULL        (0L)
+#  else /* !__cplusplus */
+#    define NULL        ((void*) 0)
+#  endif /* !__cplusplus */
 #endif
 
 #ifndef        FALSE
@@ -1690,7 +1694,7 @@ g_trash_stack_pop (GTrashStack **stack_p)
       /* NULLify private pointer here, most platforms store NULL as
        * subsequent 0 bytes
        */
-      data->next = (GTrashStack*) NULL;
+      data->next = NULL;
     }
 
   return data;

diff --git a/glib/glib.h b/glib/glib.h
index b85bec2..41b9477 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -103,8 +103,12 @@ extern "C" {
  *  been defined. It is assumed that if they are already
  *  defined then the current definition is correct.
  */
-#ifndef        NULL
-#define        NULL    ((void*) 0)
+#ifndef NULL
+#  ifdef __cplusplus
+#    define NULL        (0L)
+#  else /* !__cplusplus */
+#    define NULL        ((void*) 0)
+#  endif /* !__cplusplus */
 #endif
 
 #ifndef        FALSE
@@ -1690,7 +1694,7 @@ g_trash_stack_pop (GTrashStack **stack_p)
       /* NULLify private pointer here, most platforms store NULL as
        * subsequent 0 bytes
        */
-      data->next = (GTrashStack*) NULL;
+      data->next = NULL;
     }
 
   return data;