diff --git a/ChangeLog b/ChangeLog index bd587a515..10165c052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bd587a515..10165c052 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2000-12-14 Tor Lillqvist + * makefile.{mingw,msc}.in: No need to -DGSPAWN_HELPER when + compiling gspawn-win32-helper any longer. + * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in index c8ff21561..1ba1fd35a 100644 --- a/glib/makefile.mingw.in +++ b/glib/makefile.mingw.in @@ -99,7 +99,7 @@ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(LIBICONV_LIBS) -luser32 -lwsock32 gspawn-win32-helper.exe : gspawn-win32-helper.c - $(CC) $(CFLAGS) -mwindows -DGSPAWN_HELPER -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER) + $(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER) ################ subdirectories diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 7eaac1f57..6891af92a 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -97,7 +97,7 @@ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def gspawn-win32-helper.exe : gspawn-win32-helper.c glib-$(GLIB_VER).dll - $(CC) $(CFLAGS) -Fe$@ -DGSPAWN_HELPER -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib + $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib ################ subdirectories diff --git a/makefile.mingw.in b/makefile.mingw.in index c8ff21561..1ba1fd35a 100644 --- a/makefile.mingw.in +++ b/makefile.mingw.in @@ -99,7 +99,7 @@ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(LIBICONV_LIBS) -luser32 -lwsock32 gspawn-win32-helper.exe : gspawn-win32-helper.c - $(CC) $(CFLAGS) -mwindows -DGSPAWN_HELPER -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER) + $(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER) ################ subdirectories diff --git a/makefile.msc.in b/makefile.msc.in index 7eaac1f57..6891af92a 100644 --- a/makefile.msc.in +++ b/makefile.msc.in @@ -97,7 +97,7 @@ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def gspawn-win32-helper.exe : gspawn-win32-helper.c glib-$(GLIB_VER).dll - $(CC) $(CFLAGS) -Fe$@ -DGSPAWN_HELPER -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib + $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib ################ subdirectories