From cd759bbd6ebecc2d7f470a6b8453961a83152e69 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Thu, 24 May 2001 16:38:24 +0000 Subject: [PATCH] reflect renaming of g_string_sprintfa to g_string_printfa 2001-05-24 Hans Breuer * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa * makefile.msc.in : create an additional static lib to be used from (at least) glib-genmarshal --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/grel.c | 2 +- glib/makefile.msc.in | 9 ++++++++- grel.c | 2 +- makefile.msc.in | 9 ++++++++- 12 files changed, 74 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 84a686fbf..ffde3ab0a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-05-24 Hans Breuer + + * grel.c : reflect renaming of g_string_sprintfa to g_string_printfa + + * makefile.msc.in : create an additional static lib to be used from + (at least) glib-genmarshal + 2001-05-23 Sebastian Wilhelmi * garray.c (g_array_remove_index_fast): Tiny speed improvement diff --git a/glib/grel.c b/glib/grel.c index 1e82b26e4..41e732299 100644 --- a/glib/grel.c +++ b/glib/grel.c @@ -406,7 +406,7 @@ g_relation_print_one (gpointer tuple_key, for (i = 0; i < rel->fields; i += 1) { - g_string_sprintfa (gstring, "%p", tuples[i]); + g_string_printfa (gstring, "%p", tuples[i]); if (i < (rel->fields - 1)) g_string_append (gstring, ","); diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 06588d425..a0ace3f44 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -25,6 +25,7 @@ DLLS_TO_BUILD = \ all : \ config.h \ glibconfig.h \ + glib-$(GLIB_VER)s.lib \ $(DLLS_TO_BUILD) \ gspawn-win32-helper.exe \ testglib.exe \ @@ -87,8 +88,14 @@ makefile.msc: makefile.msc.in ################ glib +# create a static libary +glib-$(GLIB_VER)s.lib : $(glib_OBJECTS) + lib /out:glib-$(GLIB_VER)s.lib $(glib_OBJECTS) + +# $(LIBICONV_LIBS) is a runtime dependency now + glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def - $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def + $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_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$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib diff --git a/grel.c b/grel.c index 1e82b26e4..41e732299 100644 --- a/grel.c +++ b/grel.c @@ -406,7 +406,7 @@ g_relation_print_one (gpointer tuple_key, for (i = 0; i < rel->fields; i += 1) { - g_string_sprintfa (gstring, "%p", tuples[i]); + g_string_printfa (gstring, "%p", tuples[i]); if (i < (rel->fields - 1)) g_string_append (gstring, ","); diff --git a/makefile.msc.in b/makefile.msc.in index 06588d425..a0ace3f44 100644 --- a/makefile.msc.in +++ b/makefile.msc.in @@ -25,6 +25,7 @@ DLLS_TO_BUILD = \ all : \ config.h \ glibconfig.h \ + glib-$(GLIB_VER)s.lib \ $(DLLS_TO_BUILD) \ gspawn-win32-helper.exe \ testglib.exe \ @@ -87,8 +88,14 @@ makefile.msc: makefile.msc.in ################ glib +# create a static libary +glib-$(GLIB_VER)s.lib : $(glib_OBJECTS) + lib /out:glib-$(GLIB_VER)s.lib $(glib_OBJECTS) + +# $(LIBICONV_LIBS) is a runtime dependency now + glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def - $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def + $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_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$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib