🐛 Use preprocessing instructions to avoid redefining macros. #8

ADD-SP · Oct 25, 2020 · 566ae4a · 566ae4a
1 parent ab031c8
commit 566ae4a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/inc/ngx_http_waf_module_check.h b/inc/ngx_http_waf_module_check.h
@@ -5,7 +5,6 @@
 #include <ngx_inet.h>
 #include "ngx_http_waf_module_macro.h"
 #include "ngx_http_waf_module_type.h"
-// #include "uthash/src/uthash.h"
 #include <uthash.h>
 #ifndef __linux__
 #include <io.h>

diff --git a/inc/ngx_http_waf_module_core.h b/inc/ngx_http_waf_module_core.h
@@ -3,7 +3,6 @@
 #include <ngx_http.h>
 #include <ngx_regex.h>
 #include <ngx_inet.h>
-// #include "uthash/src/uthash.h"
 #include <uthash.h>
 #include "ngx_http_waf_module_macro.h"
 #include "ngx_http_waf_module_type.h"

diff --git a/inc/ngx_http_waf_module_macro.h b/inc/ngx_http_waf_module_macro.h
@@ -13,19 +13,33 @@
 #define WHITE_URL_FILE          ("white-url")
 #define WHITE_REFERER_FILE      ("white-referer")
 
-#ifndef FALSE
-#define FALSE                   (0)
-#endif
 #ifndef TRUE
 #define TRUE                    (1)
 #endif
 
+#ifndef FALSE
+#define FALSE                   (0)
+#endif
+
+#ifndef SUCCESS
 #define SUCCESS                 (1)
-#define PROCESSING              (2)
+#endif
+
+#ifndef FAIL
 #define FAIL                    (0)
+#endif
+
+#ifndef PROCESSING
+#define PROCESSING              (2)
+#endif
+
+#ifndef MATCHED
 #define MATCHED                 (1)
-#define NOT_MATCHED             (0)
+#endif
 
+#ifndef NOT_MATCHED
+#define NOT_MATCHED             (0)
+#endif
 
 #define RULE_MAX_LEN            (256 * 4 * 8)
 #define INITIAL_SIZE            (1024 * 1024 * 5)

diff --git a/inc/ngx_http_waf_module_type.h b/inc/ngx_http_waf_module_type.h
@@ -3,7 +3,6 @@
 #include <ngx_http.h>
 #include <ngx_regex.h>
 #include <ngx_inet.h>
-// #include "uthash/src/uthash.h"
 #include <uthash.h>
 #include "ngx_http_waf_module_macro.h"