diff options
| author | Tom Lane | 2005-12-06 02:29:04 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-12-06 02:29:04 +0000 |
| commit | e0e7589169fb0246dd5c6accc64b66820f4549af (patch) | |
| tree | b0318b68f02c3cc374d327f703239ced102f06a8 /src/interfaces | |
| parent | 1daac8e16522f5394f0f55caf2ce47cedbe6a5c5 (diff) | |
Make Win32 build use our port/snprintf.c routines, instead of depending
on libintl which may or may not provide what we need. Make a few marginal
cleanups to ensure this works. Andrew Dunstan and Tom Lane.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/Makefile | 16 | ||||
| -rw-r--r-- | src/interfaces/libpq/win32.h | 3 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index deaf695d97b..9de4b003e41 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.34 2005/11/30 12:49:49 meskes Exp $ +# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.35 2005/12/06 02:29:04 tgl Exp $ # #------------------------------------------------------------------------- @@ -21,11 +21,12 @@ override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \ -I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS) override CFLAGS += $(PTHREAD_CFLAGS) -# Need to recomple any libpgport object files -LIBS := $(patsubst -lpgport,, $(LIBS)) +# Need to recompile any libpgport object files +LIBS := $(filter-out -lpgport, $(LIBS)) OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \ - connect.o misc.o path.o exec.o + connect.o misc.o path.o exec.o \ + $(filter snprintf.o, $(LIBOBJS)) SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) \ $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS) @@ -45,10 +46,7 @@ include $(top_srcdir)/src/Makefile.shlib # necessarily use the same object files as the backend uses. Instead, # symlink the source files in here and build our own object file. -path.c: % : $(top_srcdir)/src/port/% - rm -f $@ && $(LN_S) $< . - -exec.c: % : $(top_srcdir)/src/port/% +path.c exec.c snprintf.c: % : $(top_srcdir)/src/port/% rm -f $@ && $(LN_S) $< . path.o: path.c $(top_builddir)/src/port/pg_config_paths.h @@ -64,7 +62,7 @@ installdirs: uninstall: uninstall-lib clean distclean maintainer-clean: clean-lib - rm -f $(OBJS) path.c exec.c + rm -f $(OBJS) path.c exec.c snprintf.c depend dep: $(CC) -MM $(CFLAGS) *.c >depend diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h index 14f1a7e09e4..f3c61c798ff 100644 --- a/src/interfaces/libpq/win32.h +++ b/src/interfaces/libpq/win32.h @@ -16,9 +16,6 @@ #define write(a,b,c) _write(a,b,c) #endif -#define vsnprintf(a,b,c,d) _vsnprintf(a,b,c,d) -#define snprintf _snprintf - #undef EAGAIN /* doesn't apply on sockets */ #undef EINTR #define EINTR WSAEINTR |