Fix the MSVC build on MS-Windows.

 output.c (vsnprintf) [_MSC_VER]: Define, instead of defining
 snprintf, which isn't used.  Reported by Christian Boos
 <cboos@edgewall.org>.
 NMakefile.template (OBJS): Add load.obj and posixfcn.obj.
 ($(OUTDIR)/pathstuff.obj): New dependency.
 Suggested by Christian Boos <cboos@edgewall.org>.

diff --git a/NMakefile.template b/NMakefile.template
index 1b6f6bd6deb791c90043938825a7c0efe6a71211..8a787a14db49bf1b5736d97fab2eaf34c1cd92fa 100644 (file)
--- a/NMakefile.template
+++ b/NMakefile.template
@@ -89,6 +89,7 @@ OBJS = \
        $(OUTDIR)/hash.obj \
        $(OUTDIR)/implicit.obj \
        $(OUTDIR)/job.obj \
+       $(OUTDIR)/load.obj \
        $(OUTDIR)/main.obj \
        $(OUTDIR)/misc.obj \
        $(OUTDIR)/output.obj \
@@ -105,6 +106,7 @@ OBJS = \
        $(OUTDIR)/fnmatch.obj \
        $(OUTDIR)/dirent.obj \
        $(OUTDIR)/pathstuff.obj \
+       $(OUTDIR)/posixfcn.obj \
        $(guile)
 
 $(OUTDIR)/make.exe: $(OUTDIR) $(OBJS)
@@ -121,5 +123,7 @@ $(OUTDIR)/fnmatch.obj : glob/fnmatch.c
        $(CC) $(CFLAGS) /c $?
 $(OUTDIR)/dirent.obj : w32/compat/dirent.c
        $(CC) $(CFLAGS) /c $?
+$(OUTDIR)/pathstuff.obj : w32/compat/posixfcn.c
+       $(CC) $(CFLAGS) /c $?
 $(OUTDIR)/pathstuff.obj : w32/pathstuff.c
        $(CC) $(CFLAGS) /c $?

diff --git a/output.c b/output.c
index fa757b075f81e1f25913af09c005cd3553d062a8..5e3b073d8a9ecf2ccce80c3863337dec6f7cf08f 100644 (file)
--- a/output.c
+++ b/output.c
@@ -61,7 +61,7 @@ unsigned int stdio_traced = 0;
 #endif
 #ifdef _MSC_VER
 # define va_copy(_d, _s) ((_d) = (_s))
-# define snprintf msc_vsnprintf
+# define vsnprintf msc_vsnprintf
 static int
 msc_vsnprintf (char *str, size_t size, const char *format, va_list ap)
 {