aboutsummaryrefslogtreecommitdiff
path: root/assert
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-02 00:09:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-02 00:09:25 +0000
commit8fb81470d9466b7e3d60cbfd6fc2d04fd1aae78a (patch)
treef8046bf51bce4125faaa2bfe115d8e0d026e57b8 /assert
parent925e31d9c22c5cdf1d80d9a5683523efc729cfd1 (diff)
downloadglibc-8fb81470d9466b7e3d60cbfd6fc2d04fd1aae78a.zip
glibc-8fb81470d9466b7e3d60cbfd6fc2d04fd1aae78a.tar.gz
glibc-8fb81470d9466b7e3d60cbfd6fc2d04fd1aae78a.tar.bz2
Update.
* gnulib/Makefile (tests): Add tst-gcc. * gnulib/tst-gcc.c: New file. * assert/Makefile (routines): Add __assert. * assert/Versions: Export __assert for glibc 2.2. * assert/__assert.c: New file. * assert/assert.h: Declare __assert. 2000-07-27 Bruno Haible <haible@clisp.cons.org> * locale/localeinfo.h (_ISCTYPE): New macro. * posix/fnmatch_loop.c (internal_fnmatch): Use it, support new LC_CTYPE locale format. * locale/programs/ld-ctype.c (locale_ctype_t): New field class_b. (ctype_output): Output class_b[nr] right before class_3level[nr]. (allocate_arrays): Fill class_b, similarly to class_3level. 2000-08-01 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'assert')
-rw-r--r--assert/Makefile2
-rw-r--r--assert/Versions4
-rw-r--r--assert/__assert.c25
-rw-r--r--assert/assert.h9
4 files changed, 38 insertions, 2 deletions
diff --git a/assert/Makefile b/assert/Makefile
index c18d673..46cae86 100644
--- a/assert/Makefile
+++ b/assert/Makefile
@@ -22,7 +22,7 @@
subdir := assert
headers := assert.h
-routines := assert assert-perr
+routines := assert assert-perr __assert
tests := test-assert test-assert-perr
include ../Rules
diff --git a/assert/Versions b/assert/Versions
index 0761373..9e1a5f2 100644
--- a/assert/Versions
+++ b/assert/Versions
@@ -3,4 +3,8 @@ libc {
# functions used in inline functions or macros
__assert_fail; __assert_perror_fail;
}
+ GLIBC_2.2 {
+ # just for standard compliance
+ __assert;
+ }
}
diff --git a/assert/__assert.c b/assert/__assert.c
new file mode 100644
index 0000000..50ebac5
--- /dev/null
+++ b/assert/__assert.c
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <assert.h>
+
+void
+__assert (const char *assertion, const char *file, int line)
+{
+ __assert_fail (assertion, file, line, (const char *) 0);
+}
diff --git a/assert/assert.h b/assert/assert.h
index b37583c..b246962 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -68,6 +68,13 @@ extern void __assert_perror_fail (int __errnum, __const char *__file,
__const char *__function)
__THROW __attribute__ ((__noreturn__));
+
+/* The following is not at all used here but needed for standard
+ compliance. */
+extern void __assert (const char *__assertion, const char *__file, int __line)
+ __THROW __attribute__ ((__noreturn__));
+
+
__END_DECLS
# define assert(expr) \