cast the return value of XSetIMValues to (void *) when comparing to NULL,

* gdk/gdkim.c (gdk_im_real_open): cast the return value of
XSetIMValues to (void *) when comparing to NULL, to workaround
the problem of some compilers barfing since older X headers don't
have the prototype for it.

-Yosh

9 files changed, 51 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 22b6a36b8..b9b3b8a24 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue May  4 11:12:56 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* gdk/gdkim.c (gdk_im_real_open): cast the return value of
+	XSetIMValues to (void *) when comparing to NULL, to workaround
+	the problem of some compilers barfing since older X headers don't
+	have the prototype for it.
+
 Tue May  4 09:32:08 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/Makefile.am gtk/gtkrc.iso-8859-2: Add a gtkrc
diff --git a/gdk/gdkim.c b/gdk/gdkim.c
index ba0a434eb..096cf24db 100644
--- a/gdk/gdkim.c
+++ b/gdk/gdkim.c
@@ -386,7 +386,7 @@ gdk_im_real_open (void)
 
       destroy_cb.callback = gdk_im_destroy_cb;
       destroy_cb.client_data = NULL;
-      if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
+      if (NULL != (void *) XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
 	GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method."));
 #endif
 
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index ba0a434eb..096cf24db 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -386,7 +386,7 @@ gdk_im_real_open (void)
 
       destroy_cb.callback = gdk_im_destroy_cb;
       destroy_cb.client_data = NULL;
-      if (NULL != XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
+      if (NULL != (void *) XSetIMValues (xim_im, XNDestroyCallback, &destroy_cb, NULL))
 	GDK_NOTE (XIM, g_warning ("Could not set destroy callback to IM. Be careful to not destroy your input method."));
 #endif