diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h index 71987648b4..da1fdee4f3 100644 --- a/src/interfaces/ecpg/include/sqlca.h +++ b/src/interfaces/ecpg/include/sqlca.h @@ -48,7 +48,6 @@ extern "C" #ifdef __cplusplus } - #endif #endif diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 3f2f7f6771..59d0091496 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -1,12 +1,8 @@ all: test1 test2 test3 test4 perftest dyntest dyntest2 -LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq -lcrypt -#LDFLAGS=-g -I../include -I/usr/include/postgresql -L../lib -L/usr/lib/postgresql -lecpg -lpq -lcrypt -#LDFLAGS=-g -I/usr/include/postgresql -lecpg -lpq -lcrypt +LDFLAGS=-g -I /usr/local/pgsql/include -L/usr/local/pgsql/lib -lecpg -lpq -#ECPG=/usr/local/pgsql/bin/ecpg ECPG=../preproc/ecpg -I../include -#ECPG=/usr/bin/ecpg -I/usr/include/postgresql .SUFFIXES: .pgc .c @@ -22,4 +18,4 @@ dyntest2: dyntest2.c $(ECPG) $? clean: - -/bin/rm test1 test2 test3 test4 perftest *.c log dyntest dyntest2 + rm -f test1 test2 test3 test4 perftest *.c log dyntest dyntest2 diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc index cb79d74644..67c1aa847f 100644 --- a/src/interfaces/ecpg/test/test1.pgc +++ b/src/interfaces/ecpg/test/test1.pgc @@ -1,3 +1,5 @@ + + exec sql include sqlca; exec sql whenever sqlerror do PrintAndStop(msg); @@ -15,8 +17,6 @@ void warn(void) fprintf(stderr, "Warning: At least one column was truncated\n"); } -exec sql include sqlca; - /* comment */ exec sql define AMOUNT 6; diff --git a/src/interfaces/ecpg/test/test2.pgc b/src/interfaces/ecpg/test/test2.pgc index 99175d39a9..a2da818122 100644 --- a/src/interfaces/ecpg/test/test2.pgc +++ b/src/interfaces/ecpg/test/test2.pgc @@ -1,3 +1,5 @@ + + exec sql include header_test; exec sql type c is char reference;