workaround for bug #137496, the real fix would involve just another small

2004-04-11  Hans Breuer  <hans@breuer.org>

	* gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
	the real fix would involve just another small API breakage,
	i.e. gdk_spawn_* using GPid not just gint.

	* gtk/makefile.msc.in : build gtk-win32.res, not gtk.res

diff --git a/ChangeLog b/ChangeLog
index 4dfc829c1120979c97b1bcc3a4c949877c3c1738..c2ba217e4486bdab7b6fac6cc50163e7def4a6d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-11  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
+       the real fix would involve just another small API breakage,
+       i.e. gdk_spawn_* using GPid not just gint.
+
+       * gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
+
 2004-04-10  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4dfc829c1120979c97b1bcc3a4c949877c3c1738..c2ba217e4486bdab7b6fac6cc50163e7def4a6d7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2004-04-11  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
+       the real fix would involve just another small API breakage,
+       i.e. gdk_spawn_* using GPid not just gint.
+
+       * gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
+
 2004-04-10  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4dfc829c1120979c97b1bcc3a4c949877c3c1738..c2ba217e4486bdab7b6fac6cc50163e7def4a6d7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2004-04-11  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
+       the real fix would involve just another small API breakage,
+       i.e. gdk_spawn_* using GPid not just gint.
+
+       * gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
+
 2004-04-10  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4dfc829c1120979c97b1bcc3a4c949877c3c1738..c2ba217e4486bdab7b6fac6cc50163e7def4a6d7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2004-04-11  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
+       the real fix would involve just another small API breakage,
+       i.e. gdk_spawn_* using GPid not just gint.
+
+       * gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
+
 2004-04-10  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4dfc829c1120979c97b1bcc3a4c949877c3c1738..c2ba217e4486bdab7b6fac6cc50163e7def4a6d7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2004-04-11  Hans Breuer  <hans@breuer.org>
+
+       * gdk/win32/gdkspawn-win32.c : workaround for bug #137496,
+       the real fix would involve just another small API breakage,
+       i.e. gdk_spawn_* using GPid not just gint.
+
+       * gtk/makefile.msc.in : build gtk-win32.res, not gtk.res
+
 2004-04-10  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state):

diff --git a/gdk/win32/gdkspawn-win32.c b/gdk/win32/gdkspawn-win32.c
index 8fdd9b4161b736fe932e27be24d174ee2ebe8c22..8f6e3d85fd439adf375504973dc26ded33e1e35a 100644 (file)
--- a/gdk/win32/gdkspawn-win32.c
+++ b/gdk/win32/gdkspawn-win32.c
@@ -38,6 +38,7 @@ gdk_spawn_on_screen (GdkScreen             *screen,
                     GError               **error)
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+  g_assert (sizeof(GPid) == sizeof(int));
 
   return g_spawn_async (working_directory,
                        argv,
@@ -45,7 +46,7 @@ gdk_spawn_on_screen (GdkScreen             *screen,
                        flags,
                        child_setup,
                        user_data,
-                       child_pid,
+                       (GPid*)child_pid,
                        error);
 }
 
@@ -64,6 +65,7 @@ gdk_spawn_on_screen_with_pipes (GdkScreen            *screen,
                                GError              **error)
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+  g_assert (sizeof(GPid) == sizeof(int));
 
   return g_spawn_async_with_pipes (working_directory,
                                   argv,
@@ -71,7 +73,7 @@ gdk_spawn_on_screen_with_pipes (GdkScreen            *screen,
                                   flags,
                                   child_setup,
                                   user_data,
-                                  child_pid,
+                                  (GPid*)child_pid,
                                   standard_input,
                                   standard_output,
                                   standard_error,

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 5991516024398116a29590309ee72f1d3b1c7bf0..59d578f03fb3e764fb95eaac6464d15e0bd6008e 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -484,13 +484,13 @@ gtkmarshal.c : gtkmarshal.list
 gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
        $(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
 
-gtk.res : gtk.rc
-       rc -DBUILDNUMBER=0 -r -fo gtk.res gtk.rc
+gtk-win32.res : gtk-win32.rc
+       rc -DBUILDNUMBER=0 -r -fo gtk-win32.res gtk-win32.rc
 
 #
 # Linking:
 #
-libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk.res
+libgtk-win32-$(GTK_VER)-0.dll : $(gtk_OBJECTS) gtk.def gtk-win32.res
        $(CC) $(CFLAGS) -LD -Fm -Fe$@ $(gtk_OBJECTS) gtk.res \
        $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(INTL_LIBS) $(GLIB_LIBS) \
        gdi32.lib user32.lib advapi32.lib wsock32.lib shell32.lib \