Merged with latest.

Author: bkaradzic

Diff for: cpp.h

@@ -35,24 +35,24 @@
 
 #include <stdlib.h>
 #include <string.h>
-#ifndef toupper
-#define toupper(c) ((c) + ('A' - 'a'))
-#endif /* no toupper */
-#ifndef tolower
-#define tolower(c) ((c) + ('a' - 'A'))
-#endif /* no tolower */
-
-#ifndef TRUE
-#define TRUE		1
-#define FALSE		0
+#ifndef fpp_toupper
+#define fpp_toupper(c) ((c) + ('A' - 'a'))
+#endif /* no fpp_toupper */
+#ifndef fpp_tolower
+#define fpp_tolower(c) ((c) + ('a' - 'A'))
+#endif /* no fpp_tolower */
+
+#ifndef FPP_TRUE
+#define FPP_TRUE		1
+#define FPP_FALSE		0
 #endif
 #ifndef EOS
 /*
  * This is predefined in Decus C
  */
 #define EOS		'\0'            /* End of string                */
 #endif
-#define EOF_CHAR	0		/* Returned by get() on eof     */
+#define EOF_CHAR	0		/* Returned by fpp_get() on eof     */
 #define NULLST		((char *) NULL) /* Pointer to nowhere (linted)  */
 #define DEF_NOARGS	(-1)            /* #define foo vs #define foo() */
 
@@ -139,9 +139,9 @@
 /*
  * These bits are set in ifstack[]
  */
-#define WAS_COMPILING	1		/* TRUE if compile set at entry */
-#define ELSE_SEEN	2		/* TRUE when #else processed	*/
-#define TRUE_SEEN	4		/* TRUE when #if TRUE processed */
+#define WAS_COMPILING	1		/* FPP_TRUE if compile set at entry */
+#define ELSE_SEEN	2		/* FPP_TRUE when #else processed	*/
+#define FPP_TRUE_SEEN	4		/* FPP_TRUE when #if FPP_TRUE processed */
 
 /*
  * Define bits for the basic types and their adjectives