trying to minimize changes needed to gd

	- change USE_THREADS to DISABLE_THREADS in gdhelpers.h
	- remove change to NONDLL in gd.h
	- add "#DEFINE NONDLL 1" and "#define DISABLE_THREADS 1" to windows/config.h
	- fix entities.tcl to agree with entities.h that was supposed to be generated from it

diff --git a/lib/gd/gd.h b/lib/gd/gd.h
index 08c256b2f72cc3414909bc80326cc2cbecf1eaa4..03f3a018f77991bfdc2f31675d933a75f1ebfa7d 100644 (file)
--- a/lib/gd/gd.h
+++ b/lib/gd/gd.h
@@ -21,8 +21,6 @@ extern "C" {
 
 #ifndef WIN32
 #define NONDLL 1
-#else
-#define NONDLL 1
 #endif /* WIN32 */
 
 #ifdef NONDLL

diff --git a/lib/gd/gdhelpers.h b/lib/gd/gdhelpers.h
index 9a449641406d284db05f5abebaba1759e339eb02..dfe5b4b1e8c3b574805c784c649076cbf7657e0c 100644 (file)
--- a/lib/gd/gdhelpers.h
+++ b/lib/gd/gdhelpers.h
@@ -29,7 +29,13 @@ int overflow2(int a, int b);
 
 /* 2.0.16: portable mutex support for thread safety. */
 
-#ifdef USE_THREADS
+#ifdef DISABLE_THREADS
+#  define gdMutexDeclare(x)
+#  define gdMutexSetup(x)
+#  define gdMutexShutdown(x)
+#  define gdMutexLock(x)
+#  define gdMutexUnlock(x)
+#else
 #  ifdef WIN32
 /* 2.0.18: must include windows.h to get CRITICAL_SECTION. */
 #    include <windows.h>
@@ -54,13 +60,7 @@ int overflow2(int a, int b);
 #      define gdMutexUnlock(x) 
 #    endif /* HAVE_PTHREAD */
 #  endif /* WIN32 */
-#else
-#  define gdMutexDeclare(x)
-#  define gdMutexSetup(x)
-#  define gdMutexShutdown(x)
-#  define gdMutexLock(x)
-#  define gdMutexUnlock(x)
-#endif /* USE_THREADS */
+#endif /* DISABLE_THREADS */
 
 #endif /* GDHELPERS_H */
 

diff --git a/windows/config.h b/windows/config.h
index 047c9301cfc1d1dd066267b003540c7e6f200260..7c5b7ea00dafb27e0a77b083a01c75fb8480d0a1 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -250,6 +250,10 @@ extern "C" {
 /* Default DPI. */
 #define DEFAULT_DPI 96
 
+/* Defines for GD */
+#define NONDLL 1
+#define DISABLE_THREADS 1
+
 #endif
 
 #ifdef __cplusplus