summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ldap/include/regex.h28
-rw-r--r--ldap/servers/plugins/syntaxes/string.c3
-rw-r--r--ldap/servers/slapd/getfilelist.c3
-rw-r--r--ldap/servers/slapd/sasl_map.c3
4 files changed, 14 insertions, 23 deletions
diff --git a/ldap/include/regex.h b/ldap/include/regex.h
index 8d8f1e3c..cc1c3e1d 100644
--- a/ldap/include/regex.h
+++ b/ldap/include/regex.h
@@ -38,21 +38,21 @@ extern "C" {
#endif
#ifdef NEEDPROTOS
-int slapd_re_init( void );
-void slapd_re_lock( void );
-int slapd_re_unlock( void );
-char * LDAP_CALL slapd_re_comp( char *pat );
-int LDAP_CALL slapd_re_exec( char *lp );
-void LDAP_CALL slapd_re_modw( char *s );
-int LDAP_CALL slapd_re_subs( char *src, char *dst );
+int re_init( void );
+void re_lock( void );
+int re_unlock( void );
+char * LDAP_CALL re_comp( char *pat );
+int LDAP_CALL re_exec( char *lp );
+void LDAP_CALL re_modw( char *s );
+int LDAP_CALL re_subs( char *src, char *dst );
#else /* NEEDPROTOS */
-int slapd_re_init();
-void slapd_re_lock();
-int slapd_re_unlock();
-char * LDAP_CALL slapd_re_comp();
-int LDAP_CALL slapd_re_exec();
-void LDAP_CALL slapd_re_modw();
-int LDAP_CALL slapd_re_subs();
+int re_init();
+void re_lock();
+int re_unlock();
+char * LDAP_CALL re_comp();
+int LDAP_CALL re_exec();
+void LDAP_CALL re_modw();
+int LDAP_CALL re_subs();
#endif /* NEEDPROTOS */
#define re_fail( m, p )
diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c
index d06a15f5..36609f8f 100644
--- a/ldap/servers/plugins/syntaxes/string.c
+++ b/ldap/servers/plugins/syntaxes/string.c
@@ -12,9 +12,6 @@
#if defined(IRIX)
#include <unistd.h>
#endif
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
static int string_filter_approx( struct berval *bvfilter,
Slapi_Value **bvals, Slapi_Value **retVal );
diff --git a/ldap/servers/slapd/getfilelist.c b/ldap/servers/slapd/getfilelist.c
index f24ed85a..aa1b0152 100644
--- a/ldap/servers/slapd/getfilelist.c
+++ b/ldap/servers/slapd/getfilelist.c
@@ -22,9 +22,6 @@
#include "prio.h"
#include "slap.h"
#include "avl.h"
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
struct data_wrapper {
char **list;
diff --git a/ldap/servers/slapd/sasl_map.c b/ldap/servers/slapd/sasl_map.c
index b9f9fbcf..6a966039 100644
--- a/ldap/servers/slapd/sasl_map.c
+++ b/ldap/servers/slapd/sasl_map.c
@@ -6,9 +6,6 @@
#include "slap.h"
#include "slapi-plugin.h"
#include "fe.h"
-#if defined( MACOS ) || defined( DOS ) || defined( _WIN32 ) || defined( NEED_BSDREGEX )
-#include "regex.h"
-#endif
/*
* Map SASL identities to LDAP searches