Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / liblber / assert.c

diff --git a/libraries/liblber/assert.c b/libraries/liblber/assert.c
index d61306d29f8cf34b53e36497ccab3f9c23295076..541768d81c889937731e0b14fe1975fa55efbdb2 100644 (file)
--- a/libraries/liblber/assert.c
+++ b/libraries/liblber/assert.c
@@ -1,18 +1,23 @@
-/*
- * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2013 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 the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 #ifdef LDAP_NEED_ASSERT
 
-#include <ac/stdio.h>
+#include <stdio.h>
 
 /*
  * helper for our private assert() macro
@@ -22,10 +27,11 @@
  * issue for now.
  */
 
-void ber_pvt_assert(char* file, int line, char* test)
+void
+ber_pvt_assert( const char *file, int line, const char *test )
 {
        fprintf(stderr,
-               "Assertion failed: %s, file %s, line %d\n",
+               _("Assertion failed: %s, file %s, line %d\n"),
                        test, file, line);
 
        abort();