From f928ffd65e1f48f6d5022e0cda701abd1abd9b0e Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Tue, 4 Dec 2012 16:35:18 +0100 Subject: [PATCH] Include isinf.o in libecpg if isinf() is not available on the system. Patch done by Jiang Guiqing . --- src/interfaces/ecpg/ecpglib/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 0cee867ee4..ced2fc4654 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -26,7 +26,7 @@ LIBS := $(filter-out -lpgport, $(LIBS)) OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o \ connect.o misc.o path.o pgstrcasecmp.o \ - $(filter snprintf.o strlcpy.o, $(LIBOBJS)) + $(filter snprintf.o strlcpy.o isinf.o, $(LIBOBJS)) # thread.c is needed only for non-WIN32 implementation of path.c ifneq ($(PORTNAME), win32) @@ -58,7 +58,11 @@ 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. +<<<<<<< HEAD path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c: % : $(top_srcdir)/src/port/% +======= +path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/% +>>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system. rm -f $@ && $(LN_S) $< . misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h -- 2.40.0