add explicit (GTrashStack*) cast for NULL pointer to cure ANSI C++ error.

Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>

        * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
        pointer to cure ANSI C++ error.

diff --git a/ChangeLog b/ChangeLog
index 4864359..8193707 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4864359..8193707 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Sep 16 13:19:54 1999  Tim Janik  <timj@gtk.org>
+
+       * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL
+       pointer to cure ANSI C++ error.
+
 Mon Sep 13 23:25:59 1999  Tim Janik  <timj@gtk.org>
 
        * gmessages.c (g_logv): in case we have to abort the program,

diff --git a/glib.h b/glib.h
index 24cf29a..b85bec2 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -1690,7 +1690,7 @@ g_trash_stack_pop (GTrashStack **stack_p)
       /* NULLify private pointer here, most platforms store NULL as
        * subsequent 0 bytes
        */
-      data->next = NULL;
+      data->next = (GTrashStack*) NULL;
     }
 
   return data;

diff --git a/glib/glib.h b/glib/glib.h
index 24cf29a..b85bec2 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -1690,7 +1690,7 @@ g_trash_stack_pop (GTrashStack **stack_p)
       /* NULLify private pointer here, most platforms store NULL as
        * subsequent 0 bytes
        */
-      data->next = NULL;
+      data->next = (GTrashStack*) NULL;
     }
 
   return data;