Moved the TRUE and FALSE #defines to lib/setup.h instead, as they don't

belong in the public header file. They are not in our name space so we
should not set them globally.

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 4c87a33ce2533d34f4ff1d4581b94d7d2c5a2aa6..42d6858266c90f7dcb1212bfe8cb9dc46884af23 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -58,13 +58,6 @@
 # include <time.h>
 #endif /* defined (vms) */
 
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 #include "types.h"
 
 #ifdef  __cplusplus

diff --git a/lib/setup.h b/lib/setup.h
index 60b9c9766f679709ffcb03614f7e44e6d074a7f2..ada3bfb88a42329cfbb8f89ad9d122e0367380ef 100644 (file)
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -57,6 +57,13 @@
 
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
 #if !defined(__cplusplus) && !defined(__BEOS__)
 typedef unsigned char bool;
 #define typedef_bool