From dd7c84185c160bb0d95bd265182f24f1f6c21924 Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Thu, 9 Feb 2012 12:39:33 -0500
Subject: [PATCH] Attempt to fix MSVC builds and other fls-related breakage.

Thanks to Andrew Dunstan for bringing this to my attention.
---
 src/port/Makefile           | 2 +-
 src/tools/msvc/Mkvcbuild.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/port/Makefile b/src/port/Makefile
index ffbe95effc3..1bf0963ba78 100644
--- 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 7881c66cdf8..4c59a0b2f83 100644
--- 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);
-- 
GitLab