cleanup old TOOLID macro

[openldap] / include / disptmpl.h

diff --git a/include/disptmpl.h b/include/disptmpl.h
index cf2f2865a47dfbbfba35600ed3430556fbdbd3ec..c99ddb240baaa2e5ba99cdaa213f452feef1f0d8 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -225,97 +225,88 @@ struct ldap_disptmpl {
 typedef int (*ldap_writeptype) LDAP_P((
        void *writeparm, char *p, ber_len_t len ));
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLDAP_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLDAP_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
-#endif
-
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_init_templates LDAP_P(( char *file, struct ldap_disptmpl **tmpllistp ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_init_templates_buf LDAP_P(( char *buf,
        ber_len_t buflen,
        struct ldap_disptmpl **tmpllistp ));
 
-LDAP_F( void )
+LIBLDAP_F( void )
 ldap_free_templates LDAP_P(( struct ldap_disptmpl *tmpllist ));
 
-LDAP_F( struct ldap_disptmpl * )
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_first_disptmpl LDAP_P(( struct ldap_disptmpl *tmpllist ));
 
-LDAP_F( struct ldap_disptmpl * )
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_next_disptmpl LDAP_P(( struct ldap_disptmpl *tmpllist,
        struct ldap_disptmpl *tmpl ));
 
-LDAP_F( struct ldap_disptmpl * )
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_name2template LDAP_P(( char *name,
        struct ldap_disptmpl *tmpllist ));
 
-LDAP_F( struct ldap_disptmpl * )
+LIBLDAP_F( struct ldap_disptmpl * )
 ldap_oc2template LDAP_P(( char **oclist,
        struct ldap_disptmpl *tmpllist ));
 
-LDAP_F( char ** )
+LIBLDAP_F( char ** )
 ldap_tmplattrs LDAP_P(( struct ldap_disptmpl *tmpl,
        char **includeattrs,
        int exclude,
        unsigned long syntaxmask ));
 
-LDAP_F( struct ldap_tmplitem * )
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_first_tmplrow LDAP_P(( struct ldap_disptmpl *tmpl ));
 
-LDAP_F( struct ldap_tmplitem * )
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_next_tmplrow LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row ));
 
-LDAP_F( struct ldap_tmplitem * )
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_first_tmplcol LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row ));
 
-LDAP_F( struct ldap_tmplitem * )
+LIBLDAP_F( struct ldap_tmplitem * )
 ldap_next_tmplcol LDAP_P(( struct ldap_disptmpl *tmpl,
        struct ldap_tmplitem *row,
        struct ldap_tmplitem *col ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_entry2text LDAP_P(( LDAP *ld,
        char *buf, LDAPMessage *entry,
        struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
        ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_vals2text LDAP_P(( LDAP *ld,
        char *buf, char **vals, char *label, int labelwidth,
        unsigned long syntaxid, ldap_writeptype writeproc, void *writeparm,
        char *eol, int rdncount ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_entry2text_search LDAP_P(( LDAP *ld,
        char *dn, char *base, LDAPMessage *entry,
        struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
        ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_entry2html LDAP_P(( LDAP *ld,
        char *buf, LDAPMessage *entry,
        struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
        ldap_writeptype writeproc, void *writeparm, char *eol, int rdncount,
        unsigned long opts, char *urlprefix, char *base ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_vals2html LDAP_P(( LDAP *ld,
        char *buf, char **vals, char *label, int labelwidth,
        unsigned long syntaxid, ldap_writeptype writeproc, void *writeparm,
        char *eol, int rdncount, char *urlprefix ));
 
-LDAP_F( int )
+LIBLDAP_F( int )
 ldap_entry2html_search LDAP_P(( LDAP
        *ld, char *dn, char *base, LDAPMessage *entry,
        struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,