Commitf928ffd

Michael Meskes

committed

Include isinf.o in libecpg if isinf() is not available on the system.

Patch done by Jiang Guiqing <jianggq@cn.fujitsu.com>.

1 parent6fa51d4 commitf928ffdCopy full SHA for f928ffd

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))`
`26`	`26`
`27`	`27`	`OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o\`
`28`	`28`	`connect.o misc.o path.o pgstrcasecmp.o\`
`29`		`-$(filter snprintf.o strlcpy.o,$(LIBOBJS))`
	`29`	`+$(filter snprintf.o strlcpy.o isinf.o,$(LIBOBJS))`
`30`	`30`
`31`	`31`	`# thread.c is needed only for non-WIN32 implementation of path.c`
`32`	`32`	`ifneq ($(PORTNAME), win32)`
`@@ -58,7 +58,11 @@ include $(top_srcdir)/src/Makefile.shlib`
`58`	`58`	`# necessarily use the same object files as the backend uses. Instead,`
`59`	`59`	`# symlink the source files in here and build our own object file.`
`60`	`60`
	`61`	`+<<<<<<< HEAD`
`61`	`62`	`path.cpgstrcasecmp.csnprintf.cstrlcpy.cthread.c:% :$(top_srcdir)/src/port/%`
	`63`	`+=======`
	`64`	`+path.cpgstrcasecmp.csnprintf.cstrlcpy.cthread.cwin32setlocale.cisinf.c:% :$(top_srcdir)/src/port/%`
	`65`	`+>>>>>>> 6fc6ebf... Include isinf.o in libecpg if isinf() is not available on the system.`
`62`	`66`	`rm -f $@ && $(LN_S) $< .`
`63`	`67`
`64`	`68`	`misc.o: misc.c$(top_builddir)/src/port/pg_config_paths.h`

Comments

(0)