selectively avoiding module cleanup code for apache 1 build and removing a duplicate...

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 3a9cabd840970b780f72641544a96cce53dc7961..01d6d49f07c2912915de12c7e5e8da0f508a0c63 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1498,13 +1498,7 @@ void module_destructor(zend_module_entry *module)
        }
 
 #if HAVE_LIBDL
-#ifdef NETWARE
-#ifdef APACHE_2_BUILD
-        if (module->handle) {
-            dlclose(module->handle);
-        }
-#endif
-#else
+#if !(defined(NETWARE) && defined(APACHE_1_BUILD))
         if (module->handle) {
             dlclose(module->handle);
         }