Misc DESC updates

[openldap] / include / disptmpl.h

diff --git a/include/disptmpl.h b/include/disptmpl.h
index cf2f2865a47dfbbfba35600ed3430556fbdbd3ec..c5a858c72723580428b551d865aaeb80559979e9 100644 (file)
--- a/include/disptmpl.h
+++ b/include/disptmpl.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1993, 1994 Regents of the University of Michigan.
@@ -23,6 +24,8 @@
  * 7 March 1994 by Mark C Smith
  */
 
+/* DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED */
+
 #ifndef _DISPTMPL_H
 #define _DISPTMPL_H
 
@@ -225,15 +228,6 @@ 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 )
 ldap_init_templates LDAP_P(( char *file, struct ldap_disptmpl **tmpllistp ));