From e9ec1e81b19668e7a73c26fe18a11c9c964237da Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 11 Apr 2004 15:25:06 +0000 Subject: [PATCH] workaround for bug #137496, the real fix would involve just another small 2004-04-11 Hans Breuer * 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 --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/win32/gdkspawn-win32.c | 6 ++++-- gtk/makefile.msc.in | 6 +++--- 7 files changed, 47 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dfc829c1..c2ba217e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-04-11 Hans Breuer + + * 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 * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4dfc829c1..c2ba217e4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2004-04-11 Hans Breuer + + * 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 * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4dfc829c1..c2ba217e4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2004-04-11 Hans Breuer + + * 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 * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4dfc829c1..c2ba217e4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2004-04-11 Hans Breuer + + * 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 * gdk/win32/gdkkeys-win32.c (gdk_keymap_translate_keyboard_state): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4dfc829c1..c2ba217e4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2004-04-11 Hans Breuer + + * 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 * 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 8fdd9b416..8f6e3d85f 100644 --- 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 599151602..59d578f03 100644 --- 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 \ -- 2.43.2