database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Fixes to make ecpg work on Cygwin, from Jason Tishler <Jason.Tishler@dothill.com>.

Browse Source
This commit is contained in:
Tom Lane 2001-05-03 16:07:52 +00:00
parent b95ff0c542
commit f13cb7e524
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/ecpg/include/sqlca.h
View File

@ -1,6 +1,14 @@
#ifndef POSTGRES_SQLCA_H #ifndef POSTGRES_SQLCA_H
#define POSTGRES_SQLCA_H #define POSTGRES_SQLCA_H
#ifndef DLLIMPORT
#ifdef __CYGWIN__
#define DLLIMPORT __declspec (dllimport)
#else
#define DLLIMPORT
#endif /* __CYGWIN__ */
#endif /* DLLIMPORT */
#define SQLERRMC_LEN 70 #define SQLERRMC_LEN 70
#ifdef __cplusplus #ifdef __cplusplus
@ -45,7 +53,7 @@ extern "C"
char sqlext[8]; char sqlext[8];
}; };
extern struct sqlca sqlca; extern DLLIMPORT struct sqlca sqlca;
#ifdef __cplusplus #ifdef __cplusplus

5
src/interfaces/ecpg/test/Makefile
View File

@ -1,7 +1,8 @@
all: test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init all: test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init
#LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq #LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq
LDFLAGS=-g -I ../include -I /usr/include/postgresql -L /usr/lib -lecpg -lpq LDFLAGS=-g -I ../include
LDLIBS=-L ../lib -lecpg -L ../../libpq -lpq
#ECPG=/usr/local/pgsql/bin/ecpg -I../include #ECPG=/usr/local/pgsql/bin/ecpg -I../include
ECPG=../preproc/ecpg -I../include ECPG=../preproc/ecpg -I../include
@ -24,4 +25,4 @@ test_text: test_text.c
$(ECPG) $? $(ECPG) $?
clean: clean:
rm -f test1 test2 test3 test4 perftest *.c log dyntest dyntest2 test_notice test_code100 test_init test_text rm -f test1 test2 test3 test4 perftest *.c log dyntest dyntest2 test_notice test_code100 test_init test_text *.exe

6
src/makefiles/Makefile.win
View File

@ -1,4 +1,4 @@
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.10 2001/04/04 21:15:56 tgl Exp $ # $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.11 2001/05/03 16:07:52 tgl Exp $
LDFLAGS+= -g LDFLAGS+= -g
DLLTOOL= dlltool DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
@ -23,3 +23,7 @@ CFLAGS_SL =
ifeq ($(findstring backend,$(subdir)), backend) ifeq ($(findstring backend,$(subdir)), backend)
override CPPFLAGS+= -DBUILDING_DLL=1 override CPPFLAGS+= -DBUILDING_DLL=1
endif endif
ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)
override CPPFLAGS+= -DBUILDING_DLL=1
endif