From cad2318a549dff68a7c4d36b5b6b8924f57e6547 Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 23 Apr 1999 03:28:47 +0000
Subject: Module work

---
 ext/ldap/ldap.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'ext/ldap/ldap.c')

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index b4bc182982..2d0a470fd9 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -49,15 +49,8 @@ void *ldap_mutex;
 
 #if HAVE_LDAP
 
-#if COMPILE_DL
-#if PHP_31
-#include "ext/phpdl.h"
-#include "ext/standard/dl.h"
-#else
 #include "dl/phpdl.h"
-#include "functions/dl.h"
-#endif
-#endif
+#include "ext/standard/dl.h"
 #include "php3_ldap.h"
 
 #if WIN32|WINNT
@@ -73,11 +66,7 @@ void *ldap_mutex;
 #define __STDC__ 1
 #endif
 
-#if PHP_31
 #include "ext/standard/php3_string.h"
-#else
-#include "functions/php3_string.h"
-#endif
 
 
 #if THREAD_SAFE & HAVE_NSLDAP
@@ -268,7 +257,7 @@ int php3_minit_ldap(INIT_FUNC_ARGS)
 	return SUCCESS;
 }
 
-int php3_mshutdown_ldap(void){
+int php3_mshutdown_ldap(SHUTDOWN_FUNC_ARGS) {
 #ifdef THREAD_SAFE
 	LDAP_TLS_VARS;
 	PHP3_TLS_THREAD_FREE(php3_ldap_module);
-- 
cgit v1.2.1