From 3bae8165cf778aed6c6fc99b013f8d762244e5bc Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 18 Mar 2001 19:54:01 +0000 Subject: [PATCH] Add braces to silence gcc -Wall. 2001-03-18 Tor Lillqvist * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. * gspawn-win32-helper.c (write_no_error): Remove unused function. * tests/makefile.mingw.in (module-test.exe): Add rules for building module-test. 2001-03-18 Tor Lillqvist * gobject.def: Correct some renamed functions. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-12 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ glib/gspawn-win32-helper.c | 10 ---------- glib/gspawn-win32.c | 10 ++++++---- gobject/ChangeLog | 4 ++++ gobject/gobject.def | 8 ++++---- gspawn-win32-helper.c | 10 ---------- gspawn-win32.c | 10 ++++++---- tests/makefile.mingw.in | 7 +++++++ 15 files changed, 99 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fd39c9595..e4ba15e7a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-03-18 Tor Lillqvist + + * gspawn-win32.c (SETUP_DEBUG): Add braces to silence gcc -Wall. + + * gspawn-win32-helper.c (write_no_error): Remove unused function. + + * tests/makefile.mingw.in (module-test.exe): Add rules for + building module-test. + Wed Mar 14 18:46:54 2001 Tim Janik * gscanner.[hc]: removed archaic gpointer derived_data; relict and diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c index 6eebba511..cd419b2ff 100644 --- a/glib/gspawn-win32-helper.c +++ b/glib/gspawn-win32-helper.c @@ -36,16 +36,6 @@ write_err_and_exit (gint fd, _exit (1); } -static void -write_no_error (gint fd) -{ - gint msg = CHILD_NO_ERROR; - gint en = 0; - - write (fd, &msg, sizeof(msg)); - write (fd, &en, sizeof(en)); -} - #ifdef __GNUC__ # ifndef _stdcall # define _stdcall __attribute__((stdcall)) diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c index 2b81a22ba..d92744a94 100644 --- a/glib/gspawn-win32.c +++ b/glib/gspawn-win32.c @@ -65,10 +65,12 @@ G_STMT_START \ { \ if (debug == -1) \ - if (getenv ("G_SPAWN_WIN32_DEBUG") != NULL) \ - debug = 1; \ - else \ - debug = 0; \ + { \ + if (getenv ("G_SPAWN_WIN32_DEBUG") != NULL) \ + debug = 1; \ + else \ + debug = 0; \ + } \ } \ G_STMT_END #endif diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 880b4c3e0..93f878af5 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +2001-03-18 Tor Lillqvist + + * gobject.def: Correct some renamed functions. + Sat Mar 17 23:18:36 2001 Tim Janik * gobject.c (g_object_get_property): minor bug-fix. diff --git a/gobject/gobject.def b/gobject/gobject.def index fe1565a51..a77a4621f 100644 --- a/gobject/gobject.def +++ b/gobject/gobject.def @@ -17,15 +17,15 @@ EXPORTS g_cclosure_new_object g_cclosure_new_object_swap g_cclosure_new_swap - g_closure_add_fnotify - g_closure_add_inotify + g_closure_add_finalize_notifier + g_closure_add_invalidate_notifier g_closure_add_marshal_guards g_closure_invalidate g_closure_invoke g_closure_new_simple g_closure_ref - g_closure_remove_fnotify - g_closure_remove_inotify + g_closure_remove_finalize_notifier + g_closure_remove_invalidate_notifier g_closure_set_marshal g_closure_set_meta_marshal g_closure_sink diff --git a/gspawn-win32-helper.c b/gspawn-win32-helper.c index 6eebba511..cd419b2ff 100644 --- a/gspawn-win32-helper.c +++ b/gspawn-win32-helper.c @@ -36,16 +36,6 @@ write_err_and_exit (gint fd, _exit (1); } -static void -write_no_error (gint fd) -{ - gint msg = CHILD_NO_ERROR; - gint en = 0; - - write (fd, &msg, sizeof(msg)); - write (fd, &en, sizeof(en)); -} - #ifdef __GNUC__ # ifndef _stdcall # define _stdcall __attribute__((stdcall)) diff --git a/gspawn-win32.c b/gspawn-win32.c index 2b81a22ba..d92744a94 100644 --- a/gspawn-win32.c +++ b/gspawn-win32.c @@ -65,10 +65,12 @@ G_STMT_START \ { \ if (debug == -1) \ - if (getenv ("G_SPAWN_WIN32_DEBUG") != NULL) \ - debug = 1; \ - else \ - debug = 0; \ + { \ + if (getenv ("G_SPAWN_WIN32_DEBUG") != NULL) \ + debug = 1; \ + else \ + debug = 0; \ + } \ } \ G_STMT_END #endif diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in index 7d6f7f828..ceef9cf13 100644 --- a/tests/makefile.mingw.in +++ b/tests/makefile.mingw.in @@ -52,6 +52,13 @@ endif .c.exe: $(CC) $(CFLAGS) -o $@ $< -L .. -lglib-$(GLIB_VER) -L ../gthread -lgthread-$(GLIB_VER) +module-test.exe : module-test.o module-test.def + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L .. -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) + $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o + $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L .. -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) + $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o + $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L .. -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) + check: all @for P in $(TESTS) ; do echo $$P; ./$$P; done @echo All tests successful.