[svn] vsnprintf() fixup.

diff --git a/ChangeLog b/ChangeLog
index 2951b64723371d0b69ba6c6ee820999fa053c29e..46905616687ac8ce5a66f9d696d57346b7b5193a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-16  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * windows/config.h.ms: snprintf and vsnprintf exist under Windows.
+
+       * windows/Makefile.src: Back out previous change.
+
 2000-11-16  Herold Heiko  <Heiko.Herold@previnet.it>
 
        * windows/Makefile.src: Compile in vsnprintf.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b9f4a0237dcf9a6fcd5f1403c5298f8978d28c2..29f9962380e4e803d2da5dd19634b3bb85a408a2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-16  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * mswindows.h: Define snprintf and vsnprintf to _snprintf and
+       _vsnprintf respectively.
+
 2000-11-15  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * config.h.in: Do the _XOPEN_SOURCE and _SVID_SOURCE things only

diff --git a/src/mswindows.h b/src/mswindows.h
index 6a3a1ea28a730f7deba4543d028f8bbca5e1e136..03ab6cd23f8c6c84c7ce608ca9c241b3899e00d6 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -31,6 +31,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 
+/* The same for snprintf() and vsnprintf().  */
+#define snprintf _snprintf
+#define vsnprintf _vsnprintf
+
 /* No stat on Windows.  */
 #define lstat stat
 

diff --git a/windows/Makefile.src b/windows/Makefile.src
index 5c21b2124a659471519bafc292ebc9b5b2b8844e..9f2a2067edc2d58b1bc20ab6ecbddfee8616533e 100644 (file)
--- a/windows/Makefile.src
+++ b/windows/Makefile.src
@@ -48,11 +48,11 @@ RM      = del
 
 SRC = alloca.c cmpt.c connect.c host.c http.c netrc.c ftp-basic.c ftp.c ftp-ls.c \
       ftp-opie.c getopt.c headers.c html.c retr.c recur.c url.c init.c utils.c main.c \
-      version.c mswindows.c fnmatch.c md5.c rbuf.c log.c snprintf.c
+      version.c mswindows.c fnmatch.c md5.c rbuf.c log.c
 
 OBJ = alloca$o cmpt$o connect$o host$o http$o netrc$o ftp-basic$o ftp$o ftp-ls$o \
       ftp-opie$o headers$o html$o retr$o recur$o url$o init$o utils$o main$o \
-      getopt$o version$o mswindows$o fnmatch$o md5$o rbuf$o log$o snprintf$o
+      getopt$o version$o mswindows$o fnmatch$o md5$o rbuf$o log$o
 
 .SUFFIXES: .c .obj
 

diff --git a/windows/config.h.ms b/windows/config.h.ms
index 7c5fa22c77f30b0b765ec6aede9d5b111c64d9ef..307dd4c79002cfa6ae141f08540007f1758a8550 100644 (file)
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -107,6 +107,12 @@ char *alloca ();
 /* Define if you have the strerror function. */
 #define HAVE_STRERROR 1
 
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
 /* Define if you have the strstr function. */
 #define HAVE_STRSTR 1