3 files changed, 4 insertions, 5 deletions

diff --git a/config.m4 b/config.m4
index 602b2c9..b97783e 100644
--- a/config.m4
+++ b/config.m4
@@ -14,4 +14,3 @@ PHP_ARG_ENABLE(suhosin7-experimental, whether to enable experimental suhosin7 fe
 if test "$PHP_SUHOSIN7_EXPERIMENTAL" != "no"; then
   AC_DEFINE(SUHOSIN7_EXPERIMENTAL, 1, [Whether to enable experimental suhosin7 features])
 fi
-
diff --git a/php_suhosin7.h b/php_suhosin7.h
index b12e49c..11dcdd5 100644
--- a/php_suhosin7.h
+++ b/php_suhosin7.h
@@ -50,7 +50,7 @@ extern zend_module_entry suhosin7_module_entry;
 #define SDEBUG
 #else
 
-#ifdef SUHOSIN_DEBUG
+#ifdef SUHOSIN7_DEBUG
 #define SDEBUG(msg...) \
         {FILE *f;f=fopen(SUHOSIN_LOG, "a+");if(f){fprintf(f,"[%u] ",getpid());fprintf(f, msg);fprintf(f,"\n");fclose(f);}}
 #else
@@ -206,7 +206,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin7)
         zend_bool  upload_disallow_elf;
         zend_bool  upload_disallow_binary;
         zend_bool  upload_remove_binary;
-#ifdef SUHOSIN_EXPERIMENTAL
+#ifdef SUHOSIN7_EXPERIMENTAL
         zend_bool  upload_allow_utf8;
 #endif
         char *upload_verification_script;
@@ -327,7 +327,7 @@ ZEND_END_MODULE_GLOBALS(suhosin7)
 */
 #define SUHOSIN7_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(suhosin7, v)
 
-#ifdef SUHOSIN_DEBUG
+#ifdef SUHOSIN7_DEBUG
 #define SUHOSIN_G(v) SUHOSIN7_G(v)
 #endif
 
diff --git a/suhosin7.c b/suhosin7.c
index 4aa755d..7b2a9d8 100644
--- a/suhosin7.c
+++ b/suhosin7.c
@@ -323,7 +323,7 @@ PHP_INI_BEGIN()
         // STD_S7_INI_ENTRY("suhosin.upload.disallow_elf", "1", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_disallow_elf)
         // STD_S7_INI_ENTRY("suhosin.upload.disallow_binary", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_disallow_binary)
         // STD_S7_INI_ENTRY("suhosin.upload.remove_binary", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_remove_binary)
-#ifdef SUHOSIN_EXPERIMENTAL
+#ifdef SUHOSIN7_EXPERIMENTAL
         // STD_S7_INI_BOOLEAN("suhosin.upload.allow_utf8", "0", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadBool, upload_allow_utf8)
 #endif
         // STD_S7_INI_ENTRY("suhosin.upload.verification_script", NULL, PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateUploadString, upload_verification_script)