database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Fix compilation on Cygwin.

Browse Source
This commit is contained in:
Peter Eisentraut
2003-05-22 17:20:44 +00:00
parent cef0652a3d
commit 6fabec242d
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/port/cygwin.h
View File

@ -1,6 +1,4 @@
/* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.2 2003/04/18 01:03:42 momjian Exp $ */ /* $Header: /cvsroot/pgsql/src/include/port/cygwin.h,v 1.3 2003/05/22 17:20:28 petere Exp $ */
#include <port/win32defs.h>
#define HAS_TEST_AND_SET #define HAS_TEST_AND_SET
typedef unsigned char slock_t; typedef unsigned char slock_t;

4
src/include/utils/elog.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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; void *arg;
} ErrorContextCallback; } ErrorContextCallback;
extern ErrorContextCallback *error_context_stack; extern DLLIMPORT ErrorContextCallback *error_context_stack;
/* GUC-configurable parameters */ /* GUC-configurable parameters */

4
src/interfaces/ecpg/Makefile
View File

@ -4,15 +4,15 @@ include $(top_builddir)/src/Makefile.global
all install installdirs uninstall dep depend distprep: all install installdirs uninstall dep depend distprep:
$(MAKE) -C include $@ $(MAKE) -C include $@
$(MAKE) -C ecpglib $@
$(MAKE) -C pgtypeslib $@ $(MAKE) -C pgtypeslib $@
$(MAKE) -C ecpglib $@
$(MAKE) -C compatlib $@ $(MAKE) -C compatlib $@
$(MAKE) -C preproc $@ $(MAKE) -C preproc $@
clean distclean maintainer-clean: clean distclean maintainer-clean:
-$(MAKE) -C include $@ -$(MAKE) -C include $@
-$(MAKE) -C ecpglib $@
-$(MAKE) -C pgtypeslib $@ -$(MAKE) -C pgtypeslib $@
-$(MAKE) -C ecpglib $@
-$(MAKE) -C compatlib $@ -$(MAKE) -C compatlib $@
-$(MAKE) -C preproc $@ -$(MAKE) -C preproc $@
-$(MAKE) -C test clean -$(MAKE) -C test clean

3
src/interfaces/ecpg/compatlib/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # 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 SO_MINOR_VERSION= 0.0
override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils $(CPPFLAGS) override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
SHLIB_LINK = -L../pgtypeslib -lpgtypes
OBJS= informix.o OBJS= informix.o

2
src/interfaces/ecpg/compatlib/informix.c
View File

@ -55,7 +55,7 @@ deccopy(Numeric *src, Numeric *target)
} }
static char * static char *
strndup(char *str, int len) strndup(const char *str, size_t len)
{ {
int real_len = strlen(str); int real_len = strlen(str);
int use_len = (real_len > len) ? len : real_len; int use_len = (real_len > len) ? len : real_len;

4
src/interfaces/ecpg/ecpglib/Makefile
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # 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 \ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
connect.o misc.o connect.o misc.o
SHLIB_LINK= $(libpq) SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq)
all: all-lib all: all-lib

4
src/makefiles/Makefile.cygwin
View File

@ -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 DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
@ -23,7 +23,7 @@ override CPPFLAGS+= -DBUILDING_DLL
endif endif
endif endif
ifneq (,$(findstring ecpg/lib,$(subdir))) ifneq (,$(findstring ecpg/ecpglib,$(subdir)))
override CPPFLAGS+= -DBUILDING_DLL override CPPFLAGS+= -DBUILDING_DLL
endif endif