Misc cleanup

diff --git a/include/disptmpl.h b/include/disptmpl.h
index e59e87de8667e89e8c016df134fa0714387b911f..c5a858c72723580428b551d865aaeb80559979e9 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -24,6 +24,8 @@
  * 7 March 1994 by Mark C Smith
  */
 
+/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */
+
 #ifndef _DISPTMPL_H
 #define _DISPTMPL_H
 

diff --git a/include/ldap_utf8.h b/include/ldap_utf8.h
index c5cc61e1099d88f2ea4f8b6387b46e1e719a24ff..ac1a1417cf1e95b95016205d92cbee0866c624df 100644 (file)
--- a/include/ldap_utf8.h
+++ b/include/ldap_utf8.h
@@ -54,44 +54,47 @@ LDAP_F( int ) ldap_x_ucs4_to_utf8( ldap_ucs4_t c, char *buf );
  */
 
 /* UTF-8 character to Wide Char */
-LDAP_F(int)
-ldap_x_utf8_to_wc LDAP_P(( wchar_t *wchar, LDAP_CONST char *utf8char ));
+LDAP_F(int) ldap_x_utf8_to_wc LDAP_P((
+       wchar_t *wchar, LDAP_CONST char *utf8char ));
 
 /* UTF-8 string to Wide Char string */
-LDAP_F(int)
-ldap_x_utf8s_to_wcs LDAP_P(( wchar_t *wcstr, LDAP_CONST char *utf8str, size_t count ));
+LDAP_F(int) ldap_x_utf8s_to_wcs LDAP_P((
+       wchar_t *wcstr, LDAP_CONST char *utf8str, size_t count ));
 
 /* Wide Char to UTF-8 character */
-LDAP_F(int)
-ldap_x_wc_to_utf8 LDAP_P(( char *utf8char, wchar_t wchar, size_t count ));
+LDAP_F(int) ldap_x_wc_to_utf8 LDAP_P((
+       char *utf8char, wchar_t wchar, size_t count ));
 
 /* Wide Char string to UTF-8 string */
-LDAP_F(int)
-ldap_x_wcs_to_utf8s LDAP_P(( char *utf8str, LDAP_CONST wchar_t *wcstr, size_t count ));
+LDAP_F(int) ldap_x_wcs_to_utf8s LDAP_P((
+       char *utf8str, LDAP_CONST wchar_t *wcstr, size_t count ));
 
 /*
  * MultiByte Char / UTF-8 Conversion Routines
  */
 
 /* UTF-8 character to MultiByte character */
-LDAP_F(int)
-ldap_x_utf8_to_mb LDAP_P(( char *mbchar, LDAP_CONST char *utf8char,
-               int (*f_wctomb)(char *mbchar, wchar_t wchar) ));
+LDAP_F(int) ldap_x_utf8_to_mb LDAP_P((
+       char *mbchar, LDAP_CONST char *utf8char,
+       int (*ldap_f_wctomb)( char *mbchar, wchar_t wchar )));
 
 /* UTF-8 string to MultiByte string */
-LDAP_F(int)
-ldap_x_utf8s_to_mbs LDAP_P(( char *mbstr, LDAP_CONST char *utf8str, size_t count,
-               size_t (*f_wcstombs)(char *mbstr, LDAP_CONST wchar_t *wcstr, size_t count) ));
+LDAP_F(int) ldap_x_utf8s_to_mbs LDAP_P((
+       char *mbstr, LDAP_CONST char *utf8str, size_t count,
+       size_t (*ldap_f_wcstombs)( char *mbstr,
+               LDAP_CONST wchar_t *wcstr, size_t count) ));
 
 /* MultiByte character to UTF-8 character */
-LDAP_F(int)
-ldap_x_mb_to_utf8 LDAP_P(( char *utf8char, LDAP_CONST char *mbchar, size_t mbsize,
-               int (*f_mbtowc)(wchar_t *wchar, LDAP_CONST char *mbchar, size_t count) ));
+LDAP_F(int) ldap_x_mb_to_utf8 LDAP_P((
+       char *utf8char, LDAP_CONST char *mbchar, size_t mbsize,
+       int (*ldap_f_mbtowc)( wchar_t *wchar,
+               LDAP_CONST char *mbchar, size_t count) ));
 
 /* MultiByte string to UTF-8 string */
-LDAP_F(int)
-ldap_x_mbs_to_utf8s LDAP_P(( char *utf8str, LDAP_CONST char *mbstr, size_t count,
-               size_t (*f_mbstowcs)(wchar_t *wcstr, LDAP_CONST char *mbstr, size_t count) ));
+LDAP_F(int) ldap_x_mbs_to_utf8s LDAP_P((
+       char *utf8str, LDAP_CONST char *mbstr, size_t count,
+       size_t (*ldap_f_mbstowcs)( wchar_t *wcstr,
+               LDAP_CONST char *mbstr, size_t count) ));
 
 LDAP_END_DECL
 

diff --git a/include/srchpref.h b/include/srchpref.h
index 80a2943a0630c0b02ef45fef5c866c989379bee5..f711bb4dc3a0129aff8354f3dbc20815888b462b 100644 (file)
--- a/include/srchpref.h
+++ b/include/srchpref.h
@@ -24,6 +24,7 @@
  * 16 May 1994 by Gordon Good
  */
 
+/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */
 
 #ifndef _SRCHPREF_H
 #define _SRCHPREF_H