From 1fd50a1454aba1917878b41ff9c5a2d81ab59169 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Tue, 5 Aug 2003 22:21:19 +0000 Subject: [PATCH] for msvc build 2003-08-05 Hans Breuer * glib/gnulib/makefile.msc : (new file) for msvc build * glib/gnulib/vasnprintf.c : use glib/galloc.h * glib/gnulib/printf.h : #include for FILE* * glib/makefile.msc.in : replace trio with gnulib * glib/glib.def : updated externals * glib/guniprop.c : fix for guniprop.c(582) : error C2082: redefinition of formal parameter 'len' --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-12 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ glib/glib.def | 7 +++++++ glib/gnulib/makefile.msc | 20 ++++++++++++++++++++ glib/gnulib/printf.h | 1 + glib/gnulib/vasnprintf.c | 2 +- glib/guniprop.c | 1 - glib/makefile.msc.in | 14 +++++++------- tests/file-test.c | 4 ++++ 13 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 glib/gnulib/makefile.msc diff --git a/ChangeLog b/ChangeLog index 884c60dd..1b423f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 884c60dd..1b423f17 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 884c60dd..1b423f17 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 884c60dd..1b423f17 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 884c60dd..1b423f17 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 884c60dd..1b423f17 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +2003-08-05 Hans Breuer + + * glib/gnulib/makefile.msc : (new file) for msvc build + + * glib/gnulib/vasnprintf.c : use glib/galloc.h + + * glib/gnulib/printf.h : #include for FILE* + + * glib/makefile.msc.in : replace trio with gnulib + + * glib/glib.def : updated externals + + * glib/guniprop.c : fix for guniprop.c(582) : error C2082: + redefinition of formal parameter 'len' + 2003-08-04 Noah Levitt * tests/unicode-normalize.c: We do handle > BMP now, so test it. diff --git a/glib/glib.def b/glib/glib.def index c476928b..78a021ea 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -8,6 +8,7 @@ EXPORTS g_array_prepend_vals g_array_remove_index g_array_remove_index_fast + g_array_remove_range g_array_set_size g_array_sized_new g_array_sort @@ -65,6 +66,7 @@ EXPORTS g_byte_array_prepend g_byte_array_remove_index g_byte_array_remove_index_fast + g_byte_array_remove_range g_byte_array_set_size g_byte_array_sized_new g_byte_array_sort @@ -157,6 +159,7 @@ EXPORTS g_file_error_quark g_file_get_contents g_file_open_tmp + g_file_read_link g_file_test g_filename_from_uri g_filename_from_utf8 @@ -170,6 +173,7 @@ EXPORTS g_get_codeset g_get_current_dir g_get_current_time + g_getenv g_get_home_dir g_get_prgname g_get_real_name @@ -412,6 +416,7 @@ EXPORTS g_ptr_array_remove_fast g_ptr_array_remove_index g_ptr_array_remove_index_fast + g_ptr_array_remove_range g_ptr_array_set_size g_ptr_array_sized_new g_ptr_array_sort @@ -483,6 +488,7 @@ EXPORTS g_set_prgname g_set_print_handler g_set_printerr_handler + g_setenv g_shell_error_quark g_shell_parse_argv g_shell_quote @@ -716,6 +722,7 @@ EXPORTS g_unichar_xdigit_value g_unicode_canonical_decomposition g_unicode_canonical_ordering + g_unsetenv g_usleep g_utf16_to_ucs4 g_utf16_to_utf8 diff --git a/glib/gnulib/makefile.msc b/glib/gnulib/makefile.msc new file mode 100644 index 00000000..3d157bb0 --- /dev/null +++ b/glib/gnulib/makefile.msc @@ -0,0 +1,20 @@ +!IFDEF DEBUG +CRT=-MDd +!ELSE +CRT=-MD +!ENDIF + +CFLAGS = -I ..\.. -DHAVE_CONFIG_H -DHAVE_LONG_LONG_FORMAT + +OBJECTS = \ + asnprintf.obj \ + printf.obj \ + printf-args.obj \ + printf-parse.obj \ + vasnprintf.obj + +gnulib.lib : $(OBJECTS) + lib -out:gnulib.lib $(OBJECTS) + +.c.obj: + $(CC) $(CRT) $(CFLAGS) -Ox -GD -c $< diff --git a/glib/gnulib/printf.h b/glib/gnulib/printf.h index e15b02b5..a7be56f4 100644 --- a/glib/gnulib/printf.h +++ b/glib/gnulib/printf.h @@ -20,6 +20,7 @@ #define __GNULIB_PRINTF_H__ #include +#include int _g_gnulib_printf (char const *format, ...); diff --git a/glib/gnulib/vasnprintf.c b/glib/gnulib/vasnprintf.c index e00bdb16..14a46218 100644 --- a/glib/gnulib/vasnprintf.c +++ b/glib/gnulib/vasnprintf.c @@ -26,7 +26,7 @@ #ifdef HAVE_CONFIG_H # include #endif -#include +#include "glib/galloca.h" #include "g-gnulib.h" diff --git a/glib/guniprop.c b/glib/guniprop.c index 2a0aa0f9..5b3d6a15 100644 --- a/glib/guniprop.c +++ b/glib/guniprop.c @@ -579,7 +579,6 @@ output_special_case (gchar *out_buffer, int which) { const guchar *p = special_case_table + offset; - gint len; if (type != G_UNICODE_TITLECASE_LETTER) p = g_utf8_next_char (p); diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 962f6b18..abf01fca 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -14,14 +14,14 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS) all : \ ..\config.h \ ..\glibconfig.h \ - trio\trio.lib \ + gnulib\gnulib.lib \ libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \ glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ gspawn-win32-helper.exe \ -trio\trio.lib : - cd trio +gnulib\gnulib.lib : + cd gnulib nmake -f makefile.msc cd .. @@ -49,7 +49,6 @@ glib_OBJECTS = \ gmessages.obj \ gnode.obj \ gprimes.obj \ - gprintf.obj \ gqsort.obj \ gqueue.obj \ gpattern.obj \ @@ -88,12 +87,12 @@ localcharset.c : libcharset/localcharset.c # create a static libary # static library can well have the real version number in the name -glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) trio\trio.lib - lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) trio\trio.lib +glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnulib.lib + lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) \ - trio\trio.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def + gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib @@ -103,3 +102,4 @@ gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AG clean:: del ..\config.h del ..\glibconfig.h + diff --git a/tests/file-test.c b/tests/file-test.c index 7a900788..89a3035a 100644 --- a/tests/file-test.c +++ b/tests/file-test.c @@ -42,6 +42,10 @@ #include #endif +#ifdef G_OS_WIN32 +#include /* For read(), write() etc */ +#endif + static void test_mkstemp (void) { -- 2.34.1