Add server side sorting

[openldap] / include / ac / assert.h

diff --git a/include/ac/assert.h b/include/ac/assert.h
index 42282ad21c4c37c4003e1dc99f7cf1260b493fe6..45e8736af273758ed335e8952d9a0cd6f8e1f891 100644 (file)
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -1,13 +1,17 @@
 /* Generic assert.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * 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 in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ASSERT_H
@@ -31,17 +35,8 @@
  * create a replacement and hope it works
  */
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLBER_DECL
-#      define LDAP_F_PRE       extern __declspec(LIBLBER_DECL)
-#   else
-#      define LDAP_F_PRE       extern
-#   endif
-#endif
-
-LDAP_F(void) ber_pvt_assert LDAP_P((
-       const char *file, int line, const char *test ));
+LBER_F (void) ber_pvt_assert LDAP_P(( const char *file, int line,
+       const char *test ));
 
 /* Can't use LDAP_STRING(test), that'd expand to "test" */
 #if defined(__STDC__) || defined(__cplusplus)