Katherine Ward wrote:

> Changes to avoid collisions with WIN32 & MFC names...
> 1.  Renamed:
>       a.  PROC => PGPROC
>       b.  GetUserName() => GetUserNameFromId()
>       c.  GetCurrentTime() => GetCurrentDateTime()
>       d.  IGNORE => IGNORE_DTF in include/utils/datetime.h & utils/adt/datetim
>
> 2.  Added _P to some lex/yacc tokens:
>       CONST, CHAR, DELETE, FLOAT, GROUP, IN, OUT

Jan

src/interfaces/ecpg/preproc/c_keywords.c

@@ -23,12 +23,12 @@ static ScanKeyword ScanKeywords[] = {
 	{"VARCHAR", VARCHAR},
 	{"auto", S_AUTO},
 	{"bool", SQL_BOOL},
-	{"char", CHAR},
+	{"char", CHAR_P},
 	{"const", S_CONST},
 	{"double", DOUBLE},
 	{"enum", SQL_ENUM},
 	{"extern", S_EXTERN},
-	{"float", FLOAT},
+	{"float", FLOAT_P},
 	{"int", INT},
 	{"long", SQL_LONG},
 	{"register", S_REGISTER},