Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit91f4a5a

Browse files
committed
Build src/port/dirmod.c only on Windows.
Since commitba7c597, port/dirmod.chas contained only Windows-specific functions. Most platforms don'tseem to mind uselessly building an empty file, but OS X for one issueswarnings. Hence, treat dirmod.c as a Windows-specific file selectedby configure rather than one that's always built. We can revert thischange if dirmod.c ever gains any non-Windows functionality again.Back-patch to 9.4 where the mentioned commit appeared.
1 parentdf9ebf1 commit91f4a5a

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

‎configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12083,6 +12083,12 @@ esac
1208312083
fi
1208412084

1208512085

12086+
case"$LIBOBJS"in
12087+
*" dirmod.$ac_objext"* ) ;;
12088+
*) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
12089+
;;
12090+
esac
12091+
1208612092
case"$LIBOBJS"in
1208712093
*" kill.$ac_objext"* ) ;;
1208812094
*) LIBOBJS="$LIBOBJS kill.$ac_objext"

‎configure.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,7 @@ fi
14391439
# Win32 support
14401440
if test "$PORTNAME" = "win32"; then
14411441
AC_REPLACE_FUNCS(gettimeofday)
1442+
AC_LIBOBJ(dirmod)
14421443
AC_LIBOBJ(kill)
14431444
AC_LIBOBJ(open)
14441445
AC_LIBOBJ(system)

‎src/include/port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extern void get_man_path(const char *my_exec_path, char *ret_path);
6161
externboolget_home_path(char*ret_path);
6262
externvoidget_parent_directory(char*path);
6363

64-
/*port/dirmod.c */
64+
/*common/pgfnames.c */
6565
externchar**pgfnames(constchar*path);
6666
externvoidpgfnames_cleanup(char**filenames);
6767

‎src/port/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ include $(top_builddir)/src/Makefile.global
3030
overrideCPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND$(CPPFLAGS)
3131
LIBS +=$(PTHREAD_LIBS)
3232

33-
OBJS =$(LIBOBJS) chklocale.odirmod.oerand48.o inet_net_ntop.o\
33+
OBJS =$(LIBOBJS) chklocale.o erand48.o inet_net_ntop.o\
3434
noblock.o path.o pgcheckdir.o pgmkdirp.o pgsleep.o\
3535
pgstrcasecmp.o pqsignal.o\
3636
qsort.o qsort_arg.o quotes.o sprompt.o tar.o thread.o

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp