diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2016-09-02 13:49:59 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2016-09-02 13:49:59 +0300 |
| commit | ec136d19b21791c845b1deeff43df137add0639e (patch) | |
| tree | da3e71960dccc380627390bc211e31455c2f1223 /src/tools | |
| parent | 9cca11c915e458323d0e746c68203f2c11da0302 (diff) | |
Move code shared between libpq and backend from backend/libpq/ to common/.
When building libpq, ip.c and md5.c were symlinked or copied from
src/backend/libpq into src/interfaces/libpq, but now that we have a
directory specifically for routines that are shared between the server and
client binaries, src/common/, move them there.
Some routines in ip.c were only used in the backend. Keep those in
src/backend/libpq, but rename to ifaddr.c to avoid confusion with the file
that's now in common.
Fix the comment in src/common/Makefile to reflect how libpq actually links
those files.
There are two more files that libpq symlinks directly from src/backend:
encnames.c and wchar.c. I don't feel compelled to move those right now,
though.
Patch by Michael Paquier, with some changes by me.
Discussion: <69938195-9c76-8523-0af8-eb718ea5b36e@iki.fi>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/ifaddrs/Makefile | 4 | ||||
| -rw-r--r-- | src/tools/ifaddrs/test_ifaddrs.c | 2 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile index 231f3889015..eed6af41e67 100644 --- a/src/tools/ifaddrs/Makefile +++ b/src/tools/ifaddrs/Makefile @@ -20,8 +20,8 @@ OBJS = test_ifaddrs.o all: test_ifaddrs -test_ifaddrs: test_ifaddrs.o $(libpq_backend_dir)/ip.o - $(CC) $(CFLAGS) test_ifaddrs.o $(libpq_backend_dir)/ip.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) +test_ifaddrs: test_ifaddrs.o $(libpq_backend_dir)/ifaddr.o + $(CC) $(CFLAGS) test_ifaddrs.o $(libpq_backend_dir)/ifaddr.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) clean distclean maintainer-clean: rm -f test_ifaddrs$(X) $(OBJS) diff --git a/src/tools/ifaddrs/test_ifaddrs.c b/src/tools/ifaddrs/test_ifaddrs.c index 48d184c84a2..80b9bb02660 100644 --- a/src/tools/ifaddrs/test_ifaddrs.c +++ b/src/tools/ifaddrs/test_ifaddrs.c @@ -12,7 +12,7 @@ #include <netinet/in.h> #include <sys/socket.h> -#include "libpq/ip.h" +#include "libpq/ifaddr.h" static void diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 67467286161..b3ed1f56e21 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -110,8 +110,8 @@ sub mkvcbuild } our @pgcommonallfiles = qw( - config_info.c controldata_utils.c exec.c keywords.c - pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c + config_info.c controldata_utils.c exec.c ip.c keywords.c + md5.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c string.c username.c wait_error.c); our @pgcommonfrontendfiles = ( |