Applied yet another patch by Christof. Thanks Cristof!

Michael Meskes · Michael Meskes · commit 5cbbdd2ecb1f · 2000-11-09T14:06:57.000Z
Synced parser.
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1013,5 +1013,11 @@ Fri Nov  3 11:34:43 CET 2000
 Sat Nov  4 17:42:43 CET 2000
 
 	- Added patch by Christof Petig to fix several small bugs.
+
+Thu Nov  9 14:40:18 CET 2000
+
+	- Synced gram.y and preproc.y. 
+	- Synced keyword.c.
+	- Added just another patch by Christof Petig.
 	- Set ecpg version to 2.8.0. 
 	- Set library version to 3.2.0.
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
@@ -1,5 +1,30 @@
-#include "postgres.h"
-#include "libpq-fe.h"
+/*
+ * this is a small part of c.h since we don't want to leak all postgres
+ * definitions into ecpg programs
+ */
+
+#ifndef __BEOS__
+#ifndef __cplusplus
+#ifndef bool
+#define bool char
+#endif   /* ndef bool */
+#endif   /* not C++ */
+
+#ifndef true
+#define true    ((bool) 1)
+#endif
+#ifndef false    
+#define bool char
+#endif   /* ndef bool */
+#endif /* __BEOS__ */
+
+#ifndef TRUE
+#define TRUE    1
+#endif   /* TRUE */
+
+#ifndef FALSE
+#define FALSE   0
+#endif   /* FALSE */
 
 #ifdef __cplusplus
 extern		"C"
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -20,7 +20,6 @@
 static ScanKeyword ScanKeywords[] = {
 	/* name					value			*/
 	{"allocate", SQL_ALLOCATE},
-	{"at", SQL_AT},
 	{"autocommit", SQL_AUTOCOMMIT},
 	{"bool", SQL_BOOL},
 	{"break", SQL_BREAK},
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.31 2000/11/07 08:46:27 meskes Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.32 2000/11/09 14:06:57 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,11 +38,13 @@ static ScanKeyword ScanKeywords[] = {
 	{"aggregate", AGGREGATE},
 	{"all", ALL},
 	{"alter", ALTER},
+	{"analyse", ANALYSE},
 	{"analyze", ANALYZE},
 	{"and", AND},
 	{"any", ANY},
 	{"as", AS},
 	{"asc", ASC},
+	{"at", AT},
 	{"backward", BACKWARD},
 	{"before", BEFORE},
 	{"begin", BEGIN_TRANS},
@@ -60,6 +62,7 @@ static ScanKeyword ScanKeywords[] = {
 	{"character", CHARACTER},
 	{"characteristics", CHARACTERISTICS},     
 	{"check", CHECK},
+	{"checkpoint", CHECKPOINT},
 	{"close", CLOSE},
 	{"cluster", CLUSTER},
 	{"coalesce", COALESCE},
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
