From 2a6f3bd69a67e6ddfbda480783f3d36ea658b032 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 17 Sep 1999 06:03:09 +0000 Subject: [PATCH] add explicit (GTrashStack*) cast for NULL pointer to cure ANSI C++ error. Thu Sep 16 13:19:54 1999 Tim Janik * glib.h (g_trash_stack_pop): add explicit (GTrashStack*) cast for NULL pointer to cure ANSI C++ error. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib.h | 2 +- glib/glib.h | 2 +- 10 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4864359e0..8193707b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * 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 4864359e0..8193707b5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Sep 16 13:19:54 1999 Tim Janik + + * 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 * gmessages.c (g_logv): in case we have to abort the program, diff --git a/glib.h b/glib.h index 24cf29a7e..b85bec258 100644 --- 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 24cf29a7e..b85bec258 100644 --- 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;