luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

for msvc build

Browse Source 
2003-08-05  Hans Breuer  <hans@breuer.org>

	* glib/gnulib/makefile.msc : (new file) for msvc build

	* glib/gnulib/vasnprintf.c : use glib/galloc.h

	* glib/gnulib/printf.h : #include <stdio.h> 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'
This commit is contained in:
Hans Breuer 2003-08-05 22:21:19 +00:00 committed by Hans Breuer
parent 10d02e3aef
commit 1fd50a1454
13 changed files with 130 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

15
ChangeLog.pre-2-10
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

15
ChangeLog.pre-2-12
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

15
ChangeLog.pre-2-4
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

15
ChangeLog.pre-2-6
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

15
ChangeLog.pre-2-8
View File

@ -1,3 +1,18 @@
2003-08-05 Hans Breuer <hans@breuer.org>
* glib/gnulib/makefile.msc : (new file) for msvc build
* glib/gnulib/vasnprintf.c : use glib/galloc.h
* glib/gnulib/printf.h : #include <stdio.h> 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 <nlevitt@columbia.edu> 2003-08-04 Noah Levitt <nlevitt@columbia.edu>
* tests/unicode-normalize.c: We do handle > BMP now, so test it. * tests/unicode-normalize.c: We do handle > BMP now, so test it.

7
glib/glib.def
View File

@ -8,6 +8,7 @@ EXPORTS
g_array_prepend_vals g_array_prepend_vals
g_array_remove_index g_array_remove_index
g_array_remove_index_fast g_array_remove_index_fast
g_array_remove_range
g_array_set_size g_array_set_size
g_array_sized_new g_array_sized_new
g_array_sort g_array_sort
@ -65,6 +66,7 @@ EXPORTS
g_byte_array_prepend g_byte_array_prepend
g_byte_array_remove_index g_byte_array_remove_index
g_byte_array_remove_index_fast g_byte_array_remove_index_fast
g_byte_array_remove_range
g_byte_array_set_size g_byte_array_set_size
g_byte_array_sized_new g_byte_array_sized_new
g_byte_array_sort g_byte_array_sort
@ -157,6 +159,7 @@ EXPORTS
g_file_error_quark g_file_error_quark
g_file_get_contents g_file_get_contents
g_file_open_tmp g_file_open_tmp
g_file_read_link
g_file_test g_file_test
g_filename_from_uri g_filename_from_uri
g_filename_from_utf8 g_filename_from_utf8
@ -170,6 +173,7 @@ EXPORTS
g_get_codeset g_get_codeset
g_get_current_dir g_get_current_dir
g_get_current_time g_get_current_time
g_getenv
g_get_home_dir g_get_home_dir
g_get_prgname g_get_prgname
g_get_real_name g_get_real_name
@ -412,6 +416,7 @@ EXPORTS
g_ptr_array_remove_fast g_ptr_array_remove_fast
g_ptr_array_remove_index g_ptr_array_remove_index
g_ptr_array_remove_index_fast g_ptr_array_remove_index_fast
g_ptr_array_remove_range
g_ptr_array_set_size g_ptr_array_set_size
g_ptr_array_sized_new g_ptr_array_sized_new
g_ptr_array_sort g_ptr_array_sort
@ -483,6 +488,7 @@ EXPORTS
g_set_prgname g_set_prgname
g_set_print_handler g_set_print_handler
g_set_printerr_handler g_set_printerr_handler
g_setenv
g_shell_error_quark g_shell_error_quark
g_shell_parse_argv g_shell_parse_argv
g_shell_quote g_shell_quote
@ -716,6 +722,7 @@ EXPORTS
g_unichar_xdigit_value g_unichar_xdigit_value
g_unicode_canonical_decomposition g_unicode_canonical_decomposition
g_unicode_canonical_ordering g_unicode_canonical_ordering
g_unsetenv
g_usleep g_usleep
g_utf16_to_ucs4 g_utf16_to_ucs4
g_utf16_to_utf8 g_utf16_to_utf8

20
glib/gnulib/makefile.msc Normal file
View File

@ -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 $<

1
glib/gnulib/printf.h
View File

@ -20,6 +20,7 @@
#define __GNULIB_PRINTF_H__ #define __GNULIB_PRINTF_H__
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
int _g_gnulib_printf (char const *format, int _g_gnulib_printf (char const *format,
...); ...);

2
glib/gnulib/vasnprintf.c
View File

@ -26,7 +26,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include <alloca.h> #include "glib/galloca.h"
#include "g-gnulib.h" #include "g-gnulib.h"

1
glib/guniprop.c
View File

@ -579,7 +579,6 @@ output_special_case (gchar *out_buffer,
int which) int which)
{ {
const guchar *p = special_case_table + offset; const guchar *p = special_case_table + offset;
gint len;
if (type != G_UNICODE_TITLECASE_LETTER) if (type != G_UNICODE_TITLECASE_LETTER)
p = g_utf8_next_char (p); p = g_utf8_next_char (p);

14
glib/makefile.msc.in
View File

@ -14,14 +14,14 @@ DEPCFLAGS = -Zm400 $(INTL_CFLAGS) $(LIBICONV_CFLAGS) $(DIRENT_CFLAGS)
all : \ all : \
..\config.h \ ..\config.h \
..\glibconfig.h \ ..\glibconfig.h \
trio\trio.lib \ gnulib\gnulib.lib \
libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \ libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll \
glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \
gspawn-win32-helper.exe \ gspawn-win32-helper.exe \
trio\trio.lib : gnulib\gnulib.lib :
cd trio cd gnulib
nmake -f makefile.msc nmake -f makefile.msc
cd .. cd ..
@ -49,7 +49,6 @@ glib_OBJECTS = \
gmessages.obj \ gmessages.obj \
gnode.obj \ gnode.obj \
gprimes.obj \ gprimes.obj \
gprintf.obj \
gqsort.obj \ gqsort.obj \
gqueue.obj \ gqueue.obj \
gpattern.obj \ gpattern.obj \
@ -88,12 +87,12 @@ localcharset.c : libcharset/localcharset.c
# create a static libary # create a static libary
# static library can well have the real version number in the name # 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 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) trio\trio.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 libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) glib.def
$(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) \ $(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 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 $(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:: clean::
del ..\config.h del ..\config.h
del ..\glibconfig.h del ..\glibconfig.h

4
tests/file-test.c
View File

@ -42,6 +42,10 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef G_OS_WIN32
#include <io.h> /* For read(), write() etc */
#endif
static void static void
test_mkstemp (void) test_mkstemp (void)
{ {