From 7fcccf10b15569e42e5df7db6d332f1013ece48b Mon Sep 17 00:00:00 2001 From: ssinger Date: Fri, 29 Apr 2011 10:51:32 -0400 Subject: [PATCH 3/4] Additional fixes for SUN C Studio build. Removing postgres.h from additional places. Only include -lsocket on solaris --- makefiles/Makefile.solaris | 4 ++-- src/slon/Makefile | 2 -- src/slonik/slonik.h | 5 ----- src/slonik/types.h | 5 +++++ src/slony_logshipper/dbutil.c | 4 ++-- src/slony_logshipper/ipcutil.c | 2 +- src/slony_logshipper/parser.y | 2 +- src/slony_logshipper/scan.l | 2 +- src/slony_logshipper/slony_logshipper.c | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/makefiles/Makefile.solaris b/makefiles/Makefile.solaris index a5afe13..628cf6d 100644 --- a/makefiles/Makefile.solaris +++ b/makefiles/Makefile.solaris @@ -16,11 +16,11 @@ CFLAGS_SL = -fPIC else CFLAGS_SL = -KPIC endif - +LDFLAGS:= $(LDFLAGS) -lsocket %.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< %.so: %.o $(LD) -G -Bdynamic -o $@ $< -sqlmansect = 7 \ No newline at end of file +sqlmansect = 7 diff --git a/src/slon/Makefile b/src/slon/Makefile index b079cfc..45261de 100644 --- a/src/slon/Makefile +++ b/src/slon/Makefile @@ -46,8 +46,6 @@ OBJS = \ ifeq ($(PORTNAME), win32) OBJS += port/pipe.o port/win32service.o $(WIN32RES) override LDFLAGS += -lwsock32 -else -override LDFLAGS += -lsocket endif diff --git a/src/slonik/slonik.h b/src/slonik/slonik.h index 7c567b6..541a08e 100644 --- a/src/slonik/slonik.h +++ b/src/slonik/slonik.h @@ -682,11 +682,6 @@ typedef struct option_list { struct option_list *next; } option_list; -#ifndef false -#define false 0 -#define true (~false) -#endif - /* * Local Variables: * tab-width: 4 diff --git a/src/slonik/types.h b/src/slonik/types.h index e720166..b669b41 100644 --- a/src/slonik/types.h +++ b/src/slonik/types.h @@ -93,4 +93,9 @@ typedef char bool; #define UINT64CONST(x) ((uint64) x) #endif +#ifndef false +#define false 0 +#define true (~false) +#endif + #endif diff --git a/src/slony_logshipper/dbutil.c b/src/slony_logshipper/dbutil.c index 79e32b5..00a4981 100644 --- a/src/slony_logshipper/dbutil.c +++ b/src/slony_logshipper/dbutil.c @@ -19,9 +19,9 @@ #include #include #endif -#include "postgres.h" -#include "libpq-fe.h" +#include "libpq-fe.h" +#include "../slonik/types.h" #include "slony_logshipper.h" diff --git a/src/slony_logshipper/ipcutil.c b/src/slony_logshipper/ipcutil.c index 9467c8a..8e61713 100644 --- a/src/slony_logshipper/ipcutil.c +++ b/src/slony_logshipper/ipcutil.c @@ -24,7 +24,7 @@ #include #include #endif -#include "postgres.h" +#include "../slonik/types.h" #include "libpq-fe.h" #include "slony_logshipper.h" diff --git a/src/slony_logshipper/parser.y b/src/slony_logshipper/parser.y index 1c1a1d8..37ff20a 100644 --- a/src/slony_logshipper/parser.y +++ b/src/slony_logshipper/parser.y @@ -11,7 +11,7 @@ */ #include "config.h" -#include "postgres.h" +#include "../slonik/types.h" #include "libpq-fe.h" #include "slony_logshipper.h" #include "../parsestatements/scanner.h" diff --git a/src/slony_logshipper/scan.l b/src/slony_logshipper/scan.l index e03972c..48cb69f 100644 --- a/src/slony_logshipper/scan.l +++ b/src/slony_logshipper/scan.l @@ -55,7 +55,7 @@ extern char * current_file; %{ #include "config.h" -#include "postgres.h" +#include "../slonik/types.h" #include "libpq-fe.h" #include "slony_logshipper.h" #include "y.tab.h" diff --git a/src/slony_logshipper/slony_logshipper.c b/src/slony_logshipper/slony_logshipper.c index 424457f..f924d03 100644 --- a/src/slony_logshipper/slony_logshipper.c +++ b/src/slony_logshipper/slony_logshipper.c @@ -31,9 +31,9 @@ #define vsnprintf _vsnprintf #endif -#include "postgres.h" #include "libpq-fe.h" +#include "../slonik/types.h" #include "slony_logshipper.h" #include "config.h" -- 1.7.0.4