Fix compilation on Cygwin.

petere · petere · commit 6fabec242d91 · 2003-05-22T17:20:44.000Z
diff --git a/src/include/port/cygwin.h b/src/include/port/cygwin.h
@@ -1,6 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.2 2003/04/18 01:03:42 momjian Exp $ */
-
-#include <port/win32defs.h>
+/* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.3 2003/05/22 17:20:28 petere Exp $ */
 
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: elog.h,v 1.42 2003/05/15 16:35:29 momjian Exp $
+ * $Id: elog.h,v 1.43 2003/05/22 17:20:43 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -264,7 +264,7 @@ typedef struct ErrorContextCallback
 	void *arg;
 } ErrorContextCallback;
 
-extern ErrorContextCallback *error_context_stack;
+extern DLLIMPORT ErrorContextCallback *error_context_stack;
 
 
 /* GUC-configurable parameters */
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
@@ -4,15 +4,15 @@ include $(top_builddir)/src/Makefile.global
 
 all install installdirs uninstall dep depend distprep:
 	$(MAKE) -C include $@
-	$(MAKE) -C ecpglib $@
 	$(MAKE) -C pgtypeslib $@
+	$(MAKE) -C ecpglib $@
 	$(MAKE) -C compatlib $@
 	$(MAKE) -C preproc $@
 
 clean distclean maintainer-clean:
 	-$(MAKE) -C include $@
-	-$(MAKE) -C ecpglib $@
 	-$(MAKE) -C pgtypeslib $@
+	-$(MAKE) -C ecpglib $@
 	-$(MAKE) -C compatlib $@
 	-$(MAKE) -C preproc $@
 	-$(MAKE) -C test clean
diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.3 2003/04/16 05:23:55 tgl Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.4 2003/05/22 17:20:44 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,6 +17,7 @@ SO_MAJOR_VERSION= 1
 SO_MINOR_VERSION= 0.0
 
 override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
+SHLIB_LINK = -L../pgtypeslib -lpgtypes
 
 OBJS= informix.o
 
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
@@ -55,7 +55,7 @@ deccopy(Numeric *src, Numeric *target)
 }
 
 static char *
-strndup(char *str, int len)
+strndup(const char *str, size_t len)
 {
 	int real_len = strlen(str);
 	int use_len = (real_len > len) ? len : real_len;
diff --git 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
 #
-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.2 2003/04/08 17:09:01 tgl Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.3 2003/05/22 17:20:44 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdi
 OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 	connect.o misc.o
 
-SHLIB_LINK= $(libpq)
+SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq)
 
 all: all-lib
 
diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.cygwin,v 1.1 2003/03/21 17:18:34 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.cygwin,v 1.2 2003/05/22 17:20:44 petere Exp $
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
 BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
@@ -23,7 +23,7 @@ override CPPFLAGS+= -DBUILDING_DLL
 endif
 endif
 
-ifneq (,$(findstring ecpg/lib,$(subdir)))
+ifneq (,$(findstring ecpg/ecpglib,$(subdir)))
 override CPPFLAGS+= -DBUILDING_DLL
 endif
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: elog.h,v 1.42 2003/05/15 16:35:29 momjian Exp $`
	`10`	`+ * $Id: elog.h,v 1.43 2003/05/22 17:20:43 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -264,7 +264,7 @@ typedef struct ErrorContextCallback`
`264`	`264`	`void *arg;`
`265`	`265`	`} ErrorContextCallback;`
`266`	`266`
`267`		`-extern ErrorContextCallback *error_context_stack;`
	`267`	`+extern DLLIMPORT ErrorContextCallback *error_context_stack;`
`268`	`268`
`269`	`269`
`270`	`270`	`/* GUC-configurable parameters */`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.3 2003/04/16 05:23:55 tgl Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.4 2003/05/22 17:20:44 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -17,6 +17,7 @@ SO_MAJOR_VERSION= 1`
`17`	`17`	`SO_MINOR_VERSION= 0.0`
`18`	`18`
`19`	`19`	`override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils $(CPPFLAGS)`
	`20`	`+SHLIB_LINK = -L../pgtypeslib -lpgtypes`
`20`	`21`
`21`	`22`	`OBJS= informix.o`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ deccopy(Numeric src, Numeric target)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`static char *`
`58`		`-strndup(char *str, int len)`
	`58`	`+strndup(const char *str, size_t len)`
`59`	`59`	`{`
`60`	`60`	`int real_len = strlen(str);`
`61`	`61`	`int use_len = (real_len > len) ? len : real_len;`