Revert previous commit

[openldap] / servers / slapd / phonetic.c

diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 80adc78a34772deee634a80341bca2a44f9d5a0a..4934cbd31688b07b83e4379cb76575f79aa9171b 100644 (file)
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,7 +1,7 @@
 /* phonetic.c - routines to do phonetic matching */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -16,15 +16,15 @@
 
 #include "slap.h"
 
-#if !defined(METAPHONE) && !defined(SLAPD_PHONETIC)
-#define METAPHONE
+#if !defined(SLAPD_METAPHONE) && !defined(SLAPD_PHONETIC)
+#define SLAPD_METAPHONE
 #endif
 
 #define iswordbreak(x)  (!isascii(x) || isspace((unsigned char) (x)) || \
                         ispunct((unsigned char) (x)) || \
                         isdigit((unsigned char) (x)) || (x) == '\0')
 
-char *
+static char *
 first_word( char *s )
 {
        if ( s == NULL ) {
@@ -42,7 +42,7 @@ first_word( char *s )
        return( s );
 }
 
-char *
+static char *
 next_word( char *s )
 {
        if ( s == NULL ) {
@@ -64,7 +64,7 @@ next_word( char *s )
        return( s );
 }
 
-char *
+static char *
 word_dup( char *w )
 {
        char    *s, *ret;
@@ -162,7 +162,7 @@ phonetic( char *s )
 }
 
 #else
-#if defined(METAPHONE)
+#if defined(SLAPD_METAPHONE)
 
 /*
  * Metaphone copied from C Gazette, June/July 1991, pp 56-57,