deleted DEBUG=YES, you can just disable debug from the program now

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@187 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Library/Util.c b/Library/Util.c
index c1f7c28729ef8968699a373b378ad2c94d8e3abd..893e5d47623531b52507dfc971a000f650e11b83 100644 (file)
--- a/Library/Util.c
+++ b/Library/Util.c
@@ -24,13 +24,17 @@
 
 #define __DEBUG_LEN 12
 
+bool debug_flag = true;
+
+void W3_Do_Debug(bool do_debug) { debug_flag = do_debug; }
+
 void __W3_Debug(const char* title, const char* message) {
-#ifdef __DEBUG__
-       char* periods = malloc(__DEBUG_LEN - strlen(title) + 1);
-       periods[__DEBUG_LEN - strlen(title)] = 0;
-       memset(periods, '.', __DEBUG_LEN - strlen(title));
-       fprintf(stderr, "%s%s %s\n", title, periods, message);
-#endif
+       if(debug_flag) {
+               char* periods = malloc(__DEBUG_LEN - strlen(title) + 1);
+               periods[__DEBUG_LEN - strlen(title)] = 0;
+               memset(periods, '.', __DEBUG_LEN - strlen(title));
+               fprintf(stderr, "%s%s %s\n", title, periods, message);
+       }
 }
 
 char* __W3_Concat(const char* str1, const char* str2) {

diff --git a/Library/W3Util.h b/Library/W3Util.h
index 47ae5b9ebaf641b1f8d4beafcb33ed080ccc8eb5..ba03227fc9e03bd701f8ce9591aecfb5ca850eda 100644 (file)
--- a/Library/W3Util.h
+++ b/Library/W3Util.h
@@ -10,6 +10,7 @@ extern "C" {
 
 #include <stdbool.h>
 
+void W3_Do_Debug(bool do_debug);
 void __W3_Debug(const char* title, const char* message);
 char* __W3_Concat(const char* str1, const char* str2);
 char* __W3_Concat3(const char* str1, const char* str2, const char* str3);

diff --git a/Makefile b/Makefile
index a6117ba8fa2f15efb91e7ca5120a620e64367fd3..5ed36ffd73f8b44c666ed5fd398d82cfefd51bcd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ endif
 endif
 
 ifeq ($(DEBUG),YES)
-CFLAGS += -g -D__DEBUG__
+CFLAGS += -g
 endif
 
 ifeq ($(WINDOWS),YES)

diff --git a/W3Version.h.p b/W3Version.h.p
index 519bcc925724301a443ae7b15474755928e552b6..76cefd23c99e8f8274cd7fb5e87e9ab29ee0c091 100644 (file)
--- a/W3Version.h.p
+++ b/W3Version.h.p
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.3F" \
+#define LIBW3_VERSION "2.4" \
 SUFFIX
 
 #ifdef __cplusplus