diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-03-14 14:08:45 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-03-14 14:08:45 -0400 |
commit | c415c13b7ef68c7f8626f74a8e593af2a5a766b9 (patch) | |
tree | 26010108578f0178aa53325ff4dba9ce370e3891 /src | |
parent | f50b5c7d0dfd997ec93c29d54dfe4f63a224ab23 (diff) |
Build src/port/dirmod.c only on Windows.
Since commit ba7c5975adea74c6f17bdb0e0427ad85962092a2, port/dirmod.c
has contained only Windows-specific functions. Most platforms don't
seem to mind uselessly building an empty file, but OS X for one issues
warnings. Hence, treat dirmod.c as a Windows-specific file selected
by configure rather than one that's always built. We can revert this
change if dirmod.c ever gains any non-Windows functionality again.
Back-patch to 9.4 where the mentioned commit appeared.
Diffstat (limited to 'src')
-rw-r--r-- | src/include/port.h | 2 | ||||
-rw-r--r-- | src/port/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/port.h b/src/include/port.h index 7dcc81ee14b..86941f7ddd7 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -61,7 +61,7 @@ extern void get_man_path(const char *my_exec_path, char *ret_path); extern bool get_home_path(char *ret_path); extern void get_parent_directory(char *path); -/* port/dirmod.c */ +/* common/pgfnames.c */ extern char **pgfnames(const char *path); extern void pgfnames_cleanup(char **filenames); diff --git a/src/port/Makefile b/src/port/Makefile index 6dc642cd3e5..835b034fe96 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 fls.o inet_net_ntop.o \ +OBJS = $(LIBOBJS) chklocale.o erand48.o fls.o inet_net_ntop.o \ noblock.o path.o pgcheckdir.o pg_crc.o pgmkdirp.o pgsleep.o \ pgstrcasecmp.o pqsignal.o \ qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o |