Attempt to fix MSVC builds and other fls-related breakage.

Thanks to Andrew Dunstan for bringing this to my attention.

diff --git a/src/port/Makefile b/src/port/Makefile
index ffbe95effc3afb227a3f96a9ca7a0aaaefa9c489..1bf0963ba7888c6ce92fd0d58a72a4015f60cb33 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -30,7 +30,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o exec.o inet_net_ntop.o \
+OBJS = $(LIBOBJS) chklocale.o dirmod.o erand48.o exec.o fls.o inet_net_ntop.o \
        noblock.o path.o pgcheckdir.o pgmkdirp.o pgsleep.o pgstrcasecmp.o \
        qsort.o qsort_arg.o sprompt.o thread.o
 

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 7881c66cdf84f3681e3d232a618a9daed5d7c799..4c59a0b2f837c61fd21d23e1906d1c35a7fc66de 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -53,9 +53,9 @@ sub mkvcbuild
     $solution = CreateSolution($vsVersion, $config);
 
     our @pgportfiles = qw(
-      chklocale.c crypt.c fseeko.c getrusage.c inet_aton.c random.c srandom.c
-      getaddrinfo.c gettimeofday.c inet_net_ntop.c kill.c open.c erand48.c
-      snprintf.c strlcat.c strlcpy.c dirmod.c exec.c noblock.c path.c
+      chklocale.c crypt.c fls.c fseeko.c getrusage.c inet_aton.c random.c
+      srandom.c getaddrinfo.c gettimeofday.c inet_net_ntop.c kill.c open.c
+      erand48.c snprintf.c strlcat.c strlcpy.c dirmod.c exec.c noblock.c path.c
       pgcheckdir.c pgmkdirp.c pgsleep.c pgstrcasecmp.c qsort.c qsort_arg.c
       sprompt.c thread.c getopt.c getopt_long.c dirent.c rint.c win32env.c
       win32error.c win32setlocale.c);