Resend Patch (with port.h) - Check for _vsnprintf

[Steven Edwards]

HI, This patch fixes this:

$ make
dllwrap --export-all --implib libwine.a -o libwine.dll config.o debug.o errno.o
ldt.o loader.o port.o  -lmsvcrt
C:\mingw\bin\dllwrap.exe: no export definition file provided.
Creating one, but that may not be what you want
debug.o: In function `default_dbg_vsprintf':
c:/source/wine/library/debug.c:358: undefined reference to `vsnprintf'
C:\mingw\bin\dllwrap.exe: C:\mingw\bin\gcc exited with status 1
make: *** [libwine.dll] Error 1

Changelog: (porting fix for Mingw/Windows)
	   check for vsnprintf and _vsnprintf 
           define vsnprintf with _vsnprintf
           



cvs diff -u configure 
Index: configure
===================================================================
RCS file: /home/wine/wine/configure,v
retrieving revision 1.387
diff -u -r1.387 configure
--- configure	9 Jan 2003 06:04:33 -0000	1.387
+++ configure	11 Jan 2003 00:42:11 -0000
@@ -13155,6 +13155,7 @@
 	_snprintf \
 	_stricmp \
 	_strnicmp \
+	_vsnprintf \
 	chsize \
 	clone \
 	ecvt \
@@ -13202,6 +13203,7 @@
 	timegm \
 	usleep \
 	vfscanf \
+	vsnprintf \
 	wait4 \
 	waitpid \
 

cvs diff -u configure.ac 
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.119
diff -u -r1.119 configure.ac
--- configure.ac	9 Jan 2003 06:04:33 -0000	1.119
+++ configure.ac	11 Jan 2003 00:43:28 -0000
@@ -936,6 +936,7 @@
 	_snprintf \
 	_stricmp \
 	_strnicmp \
+	_vsnprintf \
 	chsize \
 	clone \
 	ecvt \
@@ -983,6 +984,7 @@
 	timegm \
 	usleep \
 	vfscanf \
+	vsnprintf \
 	wait4 \
 	waitpid \
 )



cvs diff -u include/config.h.in 
Index: include/config.h.in
===================================================================
RCS file: /home/wine/wine/include/config.h.in,v
retrieving revision 1.139
diff -u -r1.139 config.h.in
--- include/config.h.in	9 Jan 2003 06:04:33 -0000	1.139
+++ include/config.h.in	11 Jan 2003 00:44:05 -0000
@@ -635,6 +635,9 @@
 /* Define to 1 if you have the `vfscanf' function. */
 #undef HAVE_VFSCANF
 
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
 /* Define to 1 if you have the `wait4' function. */
 #undef HAVE_WAIT4
 
@@ -691,6 +694,9 @@
 
 /* Define to 1 if you have the `_strnicmp' function. */
 #undef HAVE__STRNICMP
+
+/* Define to 1 if you have the '_vsnprintf' function. */
+#undef HAVE__VSNPRINTF
 
 /* Define if we have __va_copy */
 #undef HAVE___VA_COPY

cvs diff -u include/wine/port.h 
Index: include/wine/port.h
===================================================================
RCS file: /home/wine/wine/include/wine/port.h,v
retrieving revision 1.30
diff -u -r1.30 port.h
--- include/wine/port.h	18 Oct 2002 00:27:38 -0000	1.30
+++ include/wine/port.h	13 Jan 2003 20:46:32 -0000
@@ -103,6 +103,10 @@
 #define snprintf _snprintf
 #endif
 
+#if !defined(HAVE_VSNPRINTF) && defined(HAVE__VSNPRINTF)
+#define vsnprintf _vsnprintf
+#endif
+
 #ifndef S_ISLNK
 # define S_ISLNK(mod) (0)
 #endif /* S_ISLNK */



__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com