[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-18-16-g1fc2c2d
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU libidn branch, master, updated. libidn-1-18-16-g1fc2c2d |
|
Date: |
Thu, 18 Mar 2010 10:24:21 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".
http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=1fc2c2daeb279cdb147348dd13ae0d5438928079
The branch, master has been updated
via 1fc2c2daeb279cdb147348dd13ae0d5438928079 (commit)
via 31f1c8bbe4c1d0dddafa0aedf01db59d0b055003 (commit)
via 0c5d400555fc22d45cbc9e7f8d876bc15f0fdca5 (commit)
from ddf4a79873b0a1bbd34082bb5715984678ac4959 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1fc2c2daeb279cdb147348dd13ae0d5438928079
Author: Simon Josefsson <address@hidden>
Date: Thu Mar 18 11:14:37 2010 +0100
Drop self-tests with C++ code in them.
commit 31f1c8bbe4c1d0dddafa0aedf01db59d0b055003
Author: Simon Josefsson <address@hidden>
Date: Thu Mar 18 11:11:08 2010 +0100
Drop self-tests with C++ code in them.
commit 0c5d400555fc22d45cbc9e7f8d876bc15f0fdca5
Author: Simon Josefsson <address@hidden>
Date: Thu Mar 18 10:24:17 2010 +0100
Mention gengetopt.
-----------------------------------------------------------------------
Summary of changes:
README-alpha | 2 +-
build-aux/c++defs.h | 29 ++++-
build-aux/warn-on-use.h | 19 +++-
gl/Makefile.am | 2 +-
gl/m4/ansi-c++.m4 | 85 ------------
gl/m4/gnulib-cache.m4 | 4 +-
gl/m4/gnulib-comp.m4 | 24 ----
gl/m4/time_h.m4 | 1 +
gl/string.in.h | 46 ++++++
gltests/Makefile.am | 99 +-------------
gltests/test-fcntl-h-c++.cc | 43 ------
gltests/test-fcntl-h.c | 38 -----
gltests/test-stdlib-c++.cc | 138 -------------------
gltests/test-stdlib.c | 43 ------
gltests/test-string-c++.cc | 137 -------------------
gltests/test-string.c | 33 -----
gltests/test-sys_stat-c++.cc | 88 ------------
gltests/test-sys_stat.c | 288 ---------------------------------------
gltests/test-time-c++.cc | 55 --------
gltests/test-time.c | 35 -----
gltests/test-unistd-c++.cc | 189 -------------------------
gltests/test-unistd.c | 56 --------
gltests/test-wchar-c++.cc | 82 -----------
gltests/test-wchar.c | 37 -----
gltests/time.in.h | 30 ++--
lib/gl/Makefile.am | 2 +-
lib/gl/m4/ansi-c++.m4 | 85 ------------
lib/gl/m4/gnulib-cache.m4 | 4 +-
lib/gl/m4/gnulib-comp.m4 | 12 --
lib/gl/string.in.h | 46 ++++++
lib/gltests/Makefile.am | 42 ------
lib/gltests/test-iconv-h-c++.cc | 46 ------
lib/gltests/test-iconv-h.c | 31 ----
lib/gltests/test-string-c++.cc | 137 -------------------
lib/gltests/test-string.c | 33 -----
lib/gltests/test-wchar-c++.cc | 82 -----------
lib/gltests/test-wchar.c | 37 -----
37 files changed, 159 insertions(+), 2001 deletions(-)
delete mode 100644 gl/m4/ansi-c++.m4
delete mode 100644 gltests/test-fcntl-h-c++.cc
delete mode 100644 gltests/test-fcntl-h.c
delete mode 100644 gltests/test-stdlib-c++.cc
delete mode 100644 gltests/test-stdlib.c
delete mode 100644 gltests/test-string-c++.cc
delete mode 100644 gltests/test-string.c
delete mode 100644 gltests/test-sys_stat-c++.cc
delete mode 100644 gltests/test-sys_stat.c
delete mode 100644 gltests/test-time-c++.cc
delete mode 100644 gltests/test-time.c
delete mode 100644 gltests/test-unistd-c++.cc
delete mode 100644 gltests/test-unistd.c
delete mode 100644 gltests/test-wchar-c++.cc
delete mode 100644 gltests/test-wchar.c
delete mode 100644 lib/gl/m4/ansi-c++.m4
delete mode 100644 lib/gltests/test-iconv-h-c++.cc
delete mode 100644 lib/gltests/test-iconv-h.c
delete mode 100644 lib/gltests/test-string-c++.cc
delete mode 100644 lib/gltests/test-string.c
delete mode 100644 lib/gltests/test-wchar-c++.cc
delete mode 100644 lib/gltests/test-wchar.c
diff --git a/README-alpha b/README-alpha
index 2b757d5..e7de803 100644
--- a/README-alpha
+++ b/README-alpha
@@ -35,7 +35,7 @@ some hints:
gNewSense/Debian/Ubuntu:
sudo apt-get install git-core autoconf automake libtool gettext cvs
sudo apt-get install texinfo texlive texlive-generic-recommended
texlive-extra-utils
-sudo apt-get install help2man gtk-doc-tools valgrind
+sudo apt-get install help2man gtk-doc-tools valgrind gengetopt
sudo apt-get install gcj gjdoc transfig mono-mcs binfmt-support gperf
To download the version controlled sources:
diff --git a/build-aux/c++defs.h b/build-aux/c++defs.h
index 7099897..31b29c2 100644
--- a/build-aux/c++defs.h
+++ b/build-aux/c++defs.h
@@ -196,13 +196,14 @@
/* _GL_CXXALIASWARN (func);
causes a warning to be emitted when ::func is used but not when
- GNULIB_NAMESPACE::func is used. */
+ GNULIB_NAMESPACE::func is used. func must be defined without overloaded
+ variants. */
#if defined __cplusplus && defined GNULIB_NAMESPACE
# define _GL_CXXALIASWARN(func) \
- _GL_CXXALIASWARN1 (func, GNULIB_NAMESPACE)
-# define _GL_CXXALIASWARN1(func,namespace) \
- _GL_CXXALIASWARN2 (func, namespace)
-# define _GL_CXXALIASWARN2(func,namespace) \
+ _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+ _GL_CXXALIASWARN_2 (func, namespace)
+# define _GL_CXXALIASWARN_2(func,namespace) \
_GL_WARN_ON_USE (func, \
"The symbol ::" #func " refers to the system function. " \
"Use " #namespace "::" #func " instead.")
@@ -211,4 +212,22 @@
_GL_EXTERN_C int _gl_cxxalias_dummy
#endif
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+ causes a warning to be emitted when the given overloaded variant of ::func
+ is used but not when GNULIB_NAMESPACE::func is used. */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+ _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+ GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace)
\
+ _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace)
\
+ _GL_WARN_ON_USE_CXX (func, rettype, parameters_and_attributes, \
+ "The symbol ::" #func " refers to the system function.
" \
+ "Use " #namespace "::" #func " instead.")
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+ _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
#endif /* _GL_CXXDEFS_H */
diff --git a/build-aux/warn-on-use.h b/build-aux/warn-on-use.h
index b314d36..03ae871 100644
--- a/build-aux/warn-on-use.h
+++ b/build-aux/warn-on-use.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* _GL_WARN_ON_USE(function, "literal string") issues a declaration
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
for FUNCTION which will then trigger a compiler warning containing
the text of "literal string" anywhere that function is called, if
supported by the compiler. If the compiler does not support this
@@ -73,3 +73,20 @@ extern __typeof__ (function) function __attribute__
((__warning__ (message)))
extern int _gl_warn_on_use
# endif
#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype, parameters_and_attributes, "string")
+ is like _GL_WARN_ON_USE (function, "string"), except that the function is
+ declared with the given prototype, consisting of return type, parameters,
+ and attributes.
+ This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+ not work in this case. */
+#ifndef _GL_WARN_ON_USE_CXX
+# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern rettype function parameters_and_attributes \
+ __attribute__ ((__warning__ (msg)))
+# else /* Unsupported. */
+# define _GL_WARN_ON_USE_CXX(function,rettype,parameters_and_attributes,msg) \
+extern int _gl_warn_on_use
+# endif
+#endif
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 7ad78d7..6e48de7 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gltests --aux-dir=build-aux --with-tests --libtool
--macro-prefix=gl --no-vc-files autobuild csharpcomp-script error fdl-1.3
gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings
pmccabe2html progname update-copyright useless-if-before-free vc-list-files
version-etc warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests
--avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests
--avoid=time-tests --avoid=unistd-tests --avoid=wchar-tests --libtool
--macro-prefix=gl --no-vc-files autobuild csharpcomp-script error fdl-1.3
gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings
pmccabe2html progname update-copyright useless-if-before-free vc-list-files
version-etc warnings
AUTOMAKE_OPTIONS = 1.5 gnits
diff --git a/gl/m4/ansi-c++.m4 b/gl/m4/ansi-c++.m4
deleted file mode 100644
index 6066261..0000000
--- a/gl/m4/ansi-c++.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-# ansi-c++.m4 serial 2
-dnl Copyright (C) 2002-2003, 2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-# gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL])
-# Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant
-# compiler, or to ":" if none is found.
-# Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler
-# was found, or to false if not.
-
-AC_DEFUN([gl_PROG_ANSI_CXX],
-[
- m4_if([$1], [CXX], [],
- [gl_save_CXX="$CXX"])
- if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX="$CCC"
- else
- AC_CHECK_PROGS([CXX], [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r
xlC], [:])
- fi
- fi
- if test "$CXX" != ":"; then
- dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
- dnl upon failure.
- AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
- AC_LANG_PUSH([C++])
- AC_ARG_VAR([CXX], [C++ compiler command])
- AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
- echo 'int main () { return 0; }' > conftest.$ac_ext
- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- gl_cv_prog_ansicxx_works=yes
- if (./conftest; exit) 2>/dev/null; then
- gl_cv_prog_ansicxx_cross=no
- else
- gl_cv_prog_ansicxx_cross=yes
- fi
- else
- gl_cv_prog_ansicxx_works=no
- fi
- rm -fr conftest*
- AC_LANG_POP([C++])
- AC_MSG_RESULT([$gl_cv_prog_ansicxx_works])
- if test $gl_cv_prog_ansicxx_works = no; then
- CXX=:
- else
- dnl Test for namespaces.
- dnl We don't bother supporting pre-ANSI-C++ compilers.
- AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
- AC_LANG_PUSH([C++])
- cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- gl_cv_prog_ansicxx_namespaces=yes
- else
- gl_cv_prog_ansicxx_namespaces=no
- fi
- rm -fr conftest*
- AC_LANG_POP([C++])
- AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces])
- if test $gl_cv_prog_ansicxx_namespaces = no; then
- CXX=:
- fi
- fi
- fi
- m4_if([$1], [CXX], [],
- [$1="$CXX"
- CXX="$gl_save_CXX"])
- AC_SUBST([$1])
-
- AM_CONDITIONAL([$2], [test "$$1" != ":"])
-
- dnl This macro invocation resolves an automake error:
- dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not
appear in AM_CONDITIONAL
- dnl /usr/local/share/automake-1.11/am/depend2.am: The usual way to define
`am__fastdepCXX' is to add `AC_PROG_CXX'
- dnl /usr/local/share/automake-1.11/am/depend2.am: to `configure.ac' and
run `aclocal' and `autoconf' again.
- _AM_DEPENDENCIES([CXX])
-])
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index ca4701d..2cea926 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests
--aux-dir=build-aux --with-tests --libtool --macro-prefix=gl --no-vc-files
autobuild csharpcomp-script error fdl-1.3 gendocs getopt-gnu gnupload gpl-3.0
lgpl-2.1 maintainer-makefile manywarnings pmccabe2html progname
update-copyright useless-if-before-free vc-list-files version-etc warnings
+# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests
--aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests
--avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests
--avoid=unistd-tests --avoid=wchar-tests --libtool --macro-prefix=gl
--no-vc-files autobuild csharpcomp-script error fdl-1.3 gendocs getopt-gnu
gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings pmccabe2html
progname update-copyright useless-if-before-free vc-list-files version-etc
warnings
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
@@ -39,7 +39,7 @@ gl_MODULES([
version-etc
warnings
])
-gl_AVOID([])
+gl_AVOID([fcntl-h-tests stdlib-tests string-tests sys_stat-tests time-tests
unistd-tests wchar-tests])
gl_SOURCE_BASE([gl])
gl_M4_BASE([gl/m4])
gl_PO_BASE([])
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 3272604..6d3d71d 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -27,7 +27,6 @@ AC_DEFUN([gl_EARLY],
AC_REQUIRE([AC_PROG_RANLIB])
# Code from module alloca-opt:
# Code from module alloca-opt-tests:
- # Code from module ansi-c++-opt:
# Code from module arg-nonnull:
# Code from module autobuild:
AB_INIT
@@ -45,7 +44,6 @@ AC_DEFUN([gl_EARLY],
# Code from module extensions:
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
# Code from module fcntl-h:
- # Code from module fcntl-h-tests:
# Code from module fdl-1.3:
# Code from module gendocs:
# Code from module getopt-gnu:
@@ -91,19 +89,14 @@ AC_DEFUN([gl_EARLY],
# Code from module stdint:
# Code from module stdint-tests:
# Code from module stdlib:
- # Code from module stdlib-tests:
# Code from module strerror:
# Code from module strerror-tests:
# Code from module string:
- # Code from module string-tests:
# Code from module symlink:
# Code from module symlink-tests:
# Code from module sys_stat:
- # Code from module sys_stat-tests:
# Code from module time:
- # Code from module time-tests:
# Code from module unistd:
- # Code from module unistd-tests:
# Code from module unsetenv:
# Code from module unsetenv-tests:
# Code from module update-copyright:
@@ -118,7 +111,6 @@ AC_DEFUN([gl_EARLY],
# Code from module warn-on-use:
# Code from module warnings:
# Code from module wchar:
- # Code from module wchar-tests:
])
# This macro should be invoked from ./configure.ac, in the section
@@ -243,7 +235,6 @@ AC_DEFUN([gl_INIT],
gl_COMMON
gl_source_base='gltests'
gl_FUNC_ALLOCA
- gl_PROG_ANSI_CXX([CXX], [ANSICXX])
gl_FUNC_DUP2
gl_UNISTD_MODULE_INDICATOR([dup2])
gl_ENVIRON
@@ -409,7 +400,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/version-etc.h
m4/00gnulib.m4
m4/alloca.m4
- m4/ansi-c++.m4
m4/autobuild.m4
m4/csharp.m4
m4/csharpcomp.m4
@@ -462,8 +452,6 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-dup2.c
tests/test-environ.c
tests/test-errno.c
- tests/test-fcntl-h-c++.cc
- tests/test-fcntl-h.c
tests/test-getopt.c
tests/test-getopt.h
tests/test-getopt_long.h
@@ -478,27 +466,15 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-stdbool.c
tests/test-stddef.c
tests/test-stdint.c
- tests/test-stdlib-c++.cc
- tests/test-stdlib.c
tests/test-strerror.c
- tests/test-string-c++.cc
- tests/test-string.c
tests/test-symlink.c
tests/test-symlink.h
- tests/test-sys_stat-c++.cc
- tests/test-sys_stat.c
- tests/test-time-c++.cc
- tests/test-time.c
- tests/test-unistd-c++.cc
- tests/test-unistd.c
tests/test-unsetenv.c
tests/test-update-copyright.sh
tests/test-vc-list-files-cvs.sh
tests/test-vc-list-files-git.sh
tests/test-version-etc.c
tests/test-version-etc.sh
- tests/test-wchar-c++.cc
- tests/test-wchar.c
tests=lib/alloca.in.h
tests=lib/binary-io.h
tests=lib/dup2.c
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index ba2e194..f572b85 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -76,6 +76,7 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP])
GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME])
GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM])
+ GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R])
dnl If another module says to replace or to not replace, do that.
dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
dnl this lets maintainers check for portability.
diff --git a/gl/string.in.h b/gl/string.in.h
index 1af8943..de4e6d3 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -73,7 +73,14 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
void *, (void const *__s, int __c, size_t __n),
void const *, (void const *__s, int __c, size_t __n));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
+_GL_CXXALIASWARN1 (memchr, void const *,
+ (void const *__s, int __c, size_t __n));
+# else
_GL_CXXALIASWARN (memchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef memchr
/* Assume memchr is always declared. */
@@ -149,7 +156,13 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int,
size_t)
_GL_CXXALIAS_SYS_CAST2 (memrchr,
void *, (void const *, int, size_t),
void const *, (void const *, int, size_t));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
+_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
+# else
_GL_CXXALIASWARN (memrchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef memrchr
# if HAVE_RAW_DECL_MEMRCHR
@@ -173,7 +186,13 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int
__c_in)
_GL_CXXALIAS_SYS_CAST2 (rawmemchr,
void *, (void const *__s, int __c_in),
void const *, (void const *__s, int __c_in));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
+_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
+# else
_GL_CXXALIASWARN (rawmemchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef rawmemchr
# if HAVE_RAW_DECL_RAWMEMCHR
@@ -251,7 +270,13 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int
__c_in)
_GL_CXXALIAS_SYS_CAST2 (strchrnul,
char *, (char const *__s, int __c_in),
char const *, (char const *__s, int __c_in));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
+_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
+# else
_GL_CXXALIASWARN (strchrnul);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef strchrnul
# if HAVE_RAW_DECL_STRCHRNUL
@@ -354,7 +379,14 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char
const *__accept)
_GL_CXXALIAS_SYS_CAST2 (strpbrk,
char *, (char const *__s, char const *__accept),
const char *, (char const *__s, char const *__accept));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
+_GL_CXXALIASWARN1 (strpbrk, char const *,
+ (char const *__s, char const *__accept));
+# else
_GL_CXXALIASWARN (strpbrk);
+# endif
# if defined GNULIB_POSIXCHECK
/* strpbrk() assumes the second argument is a list of single-byte characters.
Even in this simple case, it does not work with multibyte strings if the
@@ -449,7 +481,14 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
char *, (const char *haystack, const char *needle),
const char *, (const char *haystack, const char
*needle));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
+_GL_CXXALIASWARN1 (strstr, const char *,
+ (const char *haystack, const char *needle));
+# else
_GL_CXXALIASWARN (strstr);
+# endif
#elif defined GNULIB_POSIXCHECK
/* strstr() does not work with multibyte strings if the locale encoding is
different from UTF-8:
@@ -489,7 +528,14 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
char *, (const char *haystack, const char *needle),
const char *, (const char *haystack, const char
*needle));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
+_GL_CXXALIASWARN1 (strcasestr, const char *,
+ (const char *haystack, const char *needle));
+# else
_GL_CXXALIASWARN (strcasestr);
+# endif
#elif defined GNULIB_POSIXCHECK
/* strcasestr() does not work with multibyte strings:
It is a glibc extension, and glibc implements it only for unibyte
diff --git a/gltests/Makefile.am b/gltests/Makefile.am
index 1a1fefe..0d1e0ae 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -202,20 +202,6 @@ EXTRA_DIST += fcntl.in.h
## end gnulib module fcntl-h
-## begin gnulib module fcntl-h-tests
-
-TESTS += test-fcntl-h
-check_PROGRAMS += test-fcntl-h
-if ANSICXX
-TESTS += test-fcntl-h-c++
-check_PROGRAMS += test-fcntl-h-c++
-test_fcntl_h_c___SOURCES = test-fcntl-h-c++.cc
-test_fcntl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
-EXTRA_DIST += test-fcntl-h.c test-fcntl-h-c++.cc signature.h
-
-## end gnulib module fcntl-h-tests
-
## begin gnulib module getopt-posix-tests
TESTS += test-getopt
@@ -506,20 +492,6 @@ EXTRA_DIST += stdlib.in.h
## end gnulib module stdlib
-## begin gnulib module stdlib-tests
-
-TESTS += test-stdlib
-check_PROGRAMS += test-stdlib
-if ANSICXX
-TESTS += test-stdlib-c++
-check_PROGRAMS += test-stdlib-c++
-test_stdlib_c___SOURCES = test-stdlib-c++.cc
-test_stdlib_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
-EXTRA_DIST += test-stdlib.c test-stdlib-c++.cc signature.h
-
-## end gnulib module stdlib-tests
-
## begin gnulib module strerror-tests
TESTS += test-strerror
@@ -528,20 +500,6 @@ EXTRA_DIST += test-strerror.c signature.h macros.h
## end gnulib module strerror-tests
-## begin gnulib module string-tests
-
-TESTS += test-string
-check_PROGRAMS += test-string
-if ANSICXX
-TESTS += test-string-c++
-check_PROGRAMS += test-string-c++
-test_string_c___SOURCES = test-string-c++.cc
-test_string_c___LDADD = $(LDADD) $(LIBINTL)
-endif
-EXTRA_DIST += test-string.c test-string-c++.cc signature.h
-
-## end gnulib module string-tests
-
## begin gnulib module symlink
@@ -617,20 +575,6 @@ EXTRA_DIST += sys_stat.in.h
## end gnulib module sys_stat
-## begin gnulib module sys_stat-tests
-
-TESTS += test-sys_stat
-check_PROGRAMS += test-sys_stat
-if ANSICXX
-TESTS += test-sys_stat-c++
-check_PROGRAMS += test-sys_stat-c++
-test_sys_stat_c___SOURCES = test-sys_stat-c++.cc
-test_sys_stat_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
-EXTRA_DIST += test-sys_stat.c test-sys_stat-c++.cc signature.h
-
-## end gnulib module sys_stat-tests
-
## begin gnulib module time
BUILT_SOURCES += time.h
@@ -647,6 +591,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H)
$(WARN_ON_USE_H)
-e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
-e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
-e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+ -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
-e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
-e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
-e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
@@ -666,34 +611,6 @@ EXTRA_DIST += time.in.h
## end gnulib module time
-## begin gnulib module time-tests
-
-TESTS += test-time
-check_PROGRAMS += test-time
-if ANSICXX
-TESTS += test-time-c++
-check_PROGRAMS += test-time-c++
-test_time_c___SOURCES = test-time-c++.cc
-test_time_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_NANOSLEEP)
-endif
-EXTRA_DIST += test-time.c test-time-c++.cc signature.h
-
-## end gnulib module time-tests
-
-## begin gnulib module unistd-tests
-
-TESTS += test-unistd
-check_PROGRAMS += test-unistd
-if ANSICXX
-TESTS += test-unistd-c++
-check_PROGRAMS += test-unistd-c++
-test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_CLOCK_GETTIME)
-endif
-EXTRA_DIST += test-unistd.c test-unistd-c++.cc signature.h
-
-## end gnulib module unistd-tests
-
## begin gnulib module unsetenv
@@ -828,20 +745,6 @@ EXTRA_DIST += wchar.in.h
## end gnulib module wchar
-## begin gnulib module wchar-tests
-
-TESTS += test-wchar
-check_PROGRAMS += test-wchar
-if ANSICXX
-TESTS += test-wchar-c++
-check_PROGRAMS += test-wchar-c++
-test_wchar_c___SOURCES = test-wchar-c++.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBINTL)
-endif
-EXTRA_DIST += test-wchar.c test-wchar-c++.cc signature.h
-
-## end gnulib module wchar-tests
-
# Clean up after Solaris cc.
clean-local:
rm -rf SunWS_cache
diff --git a/gltests/test-fcntl-h-c++.cc b/gltests/test-fcntl-h-c++.cc
deleted file mode 100644
index 8b69425..0000000
--- a/gltests/test-fcntl-h-c++.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Test of <fcntl.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <fcntl.h>
-
-#include "signature.h"
-
-
-#if GNULIB_FCNTL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fcntl, int, (int, int, ...));
-#endif
-
-#if GNULIB_OPEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::open, int, (const char *, int, ...));
-#endif
-
-#if GNULIB_OPENAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::openat, int, (int, char const *, int, ...));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-fcntl-h.c b/gltests/test-fcntl-h.c
deleted file mode 100644
index 0ce33f0..0000000
--- a/gltests/test-fcntl-h.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Test of <fcntl.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <fcntl.h>
-
-/* Check that the various O_* macros are defined. */
-int o = O_DIRECT | O_DIRECTORY | O_DSYNC | O_NDELAY | O_NOATIME | O_NONBLOCK
- | O_NOCTTY | O_NOFOLLOW | O_NOLINKS | O_RSYNC | O_SYNC | O_TTY_INIT
- | O_BINARY | O_TEXT;
-
-/* Check that the various SEEK_* macros are defined. */
-int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
-
-/* Check that the FD_* macros are defined. */
-int fd = FD_CLOEXEC;
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/test-stdlib-c++.cc b/gltests/test-stdlib-c++.cc
deleted file mode 100644
index ef82fdd..0000000
--- a/gltests/test-stdlib-c++.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Test of <stdlib.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <stdlib.h>
-
-#include "signature.h"
-
-
-//SIGNATURE_CHECK (GNULIB_NAMESPACE::atexit, int, (void (*) (void)));
-
-#if GNULIB_ATOLL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::atoll, long long, (const char *));
-#endif
-
-#if GNULIB_CALLOC_POSIX
-SIGNATURE_CHECK (GNULIB_NAMESPACE::calloc, void *, (size_t, size_t));
-#endif
-
-#if GNULIB_CANONICALIZE_FILE_NAME
-SIGNATURE_CHECK (GNULIB_NAMESPACE::canonicalize_file_name, char *,
- (const char *));
-#endif
-
-#if GNULIB_GETLOADAVG
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getloadavg, int, (double[], int));
-#endif
-
-#if GNULIB_GETSUBOPT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getsubopt, int,
- (char **, char *const *, char **));
-#endif
-
-#if GNULIB_MALLOC_POSIX
-SIGNATURE_CHECK (GNULIB_NAMESPACE::malloc, void *, (size_t));
-#endif
-
-#if GNULIB_MKDTEMP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdtemp, char *, (char *));
-#endif
-
-#if GNULIB_MKOSTEMP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkostemp, int, (char *, int));
-#endif
-
-#if GNULIB_MKOSTEMPS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkostemps, int, (char *, int, int));
-#endif
-
-#if GNULIB_MKSTEMP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkstemp, int, (char *));
-#endif
-
-#if GNULIB_MKSTEMPS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkstemps, int, (char *, int));
-#endif
-
-#if GNULIB_PUTENV
-SIGNATURE_CHECK (GNULIB_NAMESPACE::putenv, int, (char *));
-#endif
-
-#if GNULIB_RANDOM_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::random_r, int,
- (struct random_data *, int32_t *));
-#endif
-
-#if GNULIB_RANDOM_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::srandom_r, int,
- (unsigned int, struct random_data *));
-#endif
-
-#if GNULIB_RANDOM_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::initstate_r, int,
- (unsigned int, char *, size_t, struct random_data *));
-#endif
-
-#if GNULIB_RANDOM_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::setstate_r, int,
- (char *, struct random_data *));
-#endif
-
-#if GNULIB_REALLOC_POSIX
-SIGNATURE_CHECK (GNULIB_NAMESPACE::realloc, void *, (void *, size_t));
-#endif
-
-#if GNULIB_REALPATH
-SIGNATURE_CHECK (GNULIB_NAMESPACE::realpath, char *, (const char *, char *));
-#endif
-
-#if GNULIB_RPMATCH
-SIGNATURE_CHECK (GNULIB_NAMESPACE::rpmatch, int, (const char *));
-#endif
-
-#if GNULIB_SETENV
-SIGNATURE_CHECK (GNULIB_NAMESPACE::setenv, int,
- (const char *, const char *, int));
-#endif
-
-#if GNULIB_STRTOD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strtod, double, (const char *, char **));
-#endif
-
-#if GNULIB_STRTOLL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoll, long long,
- (const char *, char **, int));
-#endif
-
-#if GNULIB_STRTOULL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strtoull, unsigned long long,
- (const char *, char **, int));
-#endif
-
-#if GNULIB_UNSETENV
-SIGNATURE_CHECK (GNULIB_NAMESPACE::unsetenv, int, (const char *));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-stdlib.c b/gltests/test-stdlib.c
deleted file mode 100644
index 4bd8715..0000000
--- a/gltests/test-stdlib.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Test of <stdlib.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <stdlib.h>
-
-#include "verify.h"
-
-int exitcode;
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- /* Check that some macros are defined and different integer constants. */
- switch (exitcode)
- {
- case EXIT_SUCCESS:
- case EXIT_FAILURE:
- break;
- }
-
- return 0;
-}
diff --git a/gltests/test-string-c++.cc b/gltests/test-string-c++.cc
deleted file mode 100644
index 075f78d..0000000
--- a/gltests/test-string-c++.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Test of <string.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <string.h>
-
-#include "signature.h"
-
-
-#if GNULIB_MEMCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
- (void const *, int, size_t));
-#endif
-
-//SIGNATURE_CHECK (GNULIB_NAMESPACE::memcmp, int,
-// (void const *, void const *, size_t));
-
-#if GNULIB_MEMMEM
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memmem, void *,
- (void const *, size_t, void const *, size_t));
-#endif
-
-#if GNULIB_MEMPCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mempcpy, void *,
- (void *, void const *, size_t));
-#endif
-
-#if GNULIB_MEMRCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memrchr, void *,
- (void const *, int, size_t));
-#endif
-
-#if GNULIB_RAWMEMCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::rawmemchr, void *, (void const *, int));
-#endif
-
-#if GNULIB_STPCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::stpcpy, char *, (char *, char const *));
-#endif
-
-#if GNULIB_STPNCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::stpncpy, char *,
- (char *, char const *, size_t));
-#endif
-
-#if GNULIB_STRCHRNUL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strchrnul, char *, (char const *, int));
-#endif
-
-#if GNULIB_STRDUP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strdup, char *, (char const *));
-#endif
-
-#if GNULIB_STRNDUP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strndup, char *, (char const *, size_t));
-#endif
-
-#if GNULIB_STRNLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strnlen, size_t, (char const *, size_t));
-#endif
-
-#if GNULIB_STRPBRK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strpbrk, char *,
- (char const *, char const *));
-#endif
-
-#if GNULIB_STRSEP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strsep, char *, (char **, char const *));
-#endif
-
-#if GNULIB_STRSTR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strstr, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRCASESTR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strcasestr, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRTOK_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strtok_r, char *,
- (char *, char const *, char **));
-#endif
-
-#if GNULIB_MBSLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbslen, size_t, (const char *));
-#endif
-
-#if GNULIB_MBSCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbschr, char *, (const char *, int));
-#endif
-
-#if GNULIB_MBSRCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrchr, char *, (const char *, int));
-#endif
-
-#if GNULIB_MBSPBRK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbspbrk, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRERROR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strerror, char *, (int));
-#endif
-
-#if GNULIB_STRSIGNAL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strsignal, char *, (int));
-#endif
-
-#if GNULIB_STRVERSCMP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strverscmp, int,
- (const char *, const char *));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-string.c b/gltests/test-string.c
deleted file mode 100644
index 019a817..0000000
--- a/gltests/test-string.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test of <string.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "verify.h"
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/test-sys_stat-c++.cc b/gltests/test-sys_stat-c++.cc
deleted file mode 100644
index 8bfafad..0000000
--- a/gltests/test-sys_stat-c++.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Test of <sys/stat.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <sys/stat.h>
-
-#include "signature.h"
-
-
-#if GNULIB_FCHMODAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fchmodat, int,
- (int, char const *, mode_t, int));
-#endif
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fstat, int, (int, struct stat *));
-
-#if GNULIB_FSTATAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fstatat, int,
- (int, char const *, struct stat *, int));
-#endif
-
-#if GNULIB_FUTIMENS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::futimens, int,
- (int, struct timespec const[2]));
-#endif
-
-#if GNULIB_LCHMOD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::lchmod, int, (const char *, mode_t));
-#endif
-
-#if GNULIB_LSTAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::lstat, int, (const char *, struct stat *));
-#endif
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdir, int, (char const *, mode_t));
-
-#if GNULIB_MKDIRAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkdirat, int, (int, char const *, mode_t));
-#endif
-
-#if GNULIB_MKFIFO
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkfifo, int, (char const *, mode_t));
-#endif
-
-#if GNULIB_MKFIFOAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mkfifoat, int, (int, char const *, mode_t));
-#endif
-
-#if GNULIB_MKNOD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mknod, int, (char const *, mode_t, dev_t));
-#endif
-
-#if GNULIB_MKNODAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mknodat, int,
- (int, char const *, mode_t, dev_t));
-#endif
-
-#if GNULIB_STAT
-//SIGNATURE_CHECK (GNULIB_NAMESPACE::stat, int, (const char *, struct stat *));
-#endif
-
-#if GNULIB_UTIMENSAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::utimensat, int,
- (int, char const *, struct timespec const[2], int));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-sys_stat.c b/gltests/test-sys_stat.c
deleted file mode 100644
index 5f1aacd..0000000
--- a/gltests/test-sys_stat.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Test of <sys/stat.h> substitute.
- Copyright (C) 2007-2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <sys/stat.h>
-
-#include "verify.h"
-
-/* Check the existence of some macros. */
-int a[] =
- {
- S_IFMT,
- S_IFBLK, S_IFCHR, S_IFDIR, S_IFIFO, S_IFREG,
-#ifdef S_IFLNK /* missing on mingw and djgpp */
- S_IFLNK,
-#endif
-#ifdef S_IFSOCK /* missing on mingw and djgpp */
- S_IFSOCK,
-#endif
- S_IRWXU, S_IRUSR, S_IWUSR, S_IXUSR,
- S_IRWXG, S_IRGRP, S_IWGRP, S_IXGRP,
- S_IRWXO, S_IROTH, S_IWOTH, S_IXOTH,
- S_ISUID, S_ISGID, S_ISVTX,
- S_ISBLK (S_IFREG),
- S_ISCHR (S_IFREG),
- S_ISDIR (S_IFREG),
- S_ISFIFO (S_IFREG),
- S_ISREG (S_IFREG),
- S_ISLNK (S_IFREG),
- S_ISSOCK (S_IFREG),
- S_ISDOOR (S_IFREG),
- S_ISMPB (S_IFREG),
- S_ISNAM (S_IFREG),
- S_ISNWK (S_IFREG),
- S_ISPORT (S_IFREG),
- S_ISCTG (S_IFREG),
- S_ISOFD (S_IFREG),
- S_ISOFL (S_IFREG),
- S_ISWHT (S_IFREG)
- };
-
-/* Sanity checks. */
-
-verify (S_IRWXU == (S_IRUSR | S_IWUSR | S_IXUSR));
-verify (S_IRWXG == (S_IRGRP | S_IWGRP | S_IXGRP));
-verify (S_IRWXO == (S_IROTH | S_IWOTH | S_IXOTH));
-
-verify (S_ISBLK (S_IFBLK));
-verify (!S_ISBLK (S_IFCHR));
-verify (!S_ISBLK (S_IFDIR));
-verify (!S_ISBLK (S_IFIFO));
-verify (!S_ISBLK (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISBLK (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISBLK (S_IFSOCK));
-#endif
-
-verify (!S_ISCHR (S_IFBLK));
-verify (S_ISCHR (S_IFCHR));
-verify (!S_ISCHR (S_IFDIR));
-verify (!S_ISCHR (S_IFIFO));
-verify (!S_ISCHR (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISCHR (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISCHR (S_IFSOCK));
-#endif
-
-verify (!S_ISDIR (S_IFBLK));
-verify (!S_ISDIR (S_IFCHR));
-verify (S_ISDIR (S_IFDIR));
-verify (!S_ISDIR (S_IFIFO));
-verify (!S_ISDIR (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISDIR (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISDIR (S_IFSOCK));
-#endif
-
-verify (!S_ISFIFO (S_IFBLK));
-verify (!S_ISFIFO (S_IFCHR));
-verify (!S_ISFIFO (S_IFDIR));
-verify (S_ISFIFO (S_IFIFO));
-verify (!S_ISFIFO (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISFIFO (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISFIFO (S_IFSOCK));
-#endif
-
-verify (!S_ISREG (S_IFBLK));
-verify (!S_ISREG (S_IFCHR));
-verify (!S_ISREG (S_IFDIR));
-verify (!S_ISREG (S_IFIFO));
-verify (S_ISREG (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISREG (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISREG (S_IFSOCK));
-#endif
-
-verify (!S_ISLNK (S_IFBLK));
-verify (!S_ISLNK (S_IFCHR));
-verify (!S_ISLNK (S_IFDIR));
-verify (!S_ISLNK (S_IFIFO));
-verify (!S_ISLNK (S_IFREG));
-#ifdef S_IFLNK
-verify (S_ISLNK (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISLNK (S_IFSOCK));
-#endif
-
-verify (!S_ISSOCK (S_IFBLK));
-verify (!S_ISSOCK (S_IFCHR));
-verify (!S_ISSOCK (S_IFDIR));
-verify (!S_ISSOCK (S_IFIFO));
-verify (!S_ISSOCK (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISSOCK (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (S_ISSOCK (S_IFSOCK));
-#endif
-
-verify (!S_ISDOOR (S_IFBLK));
-verify (!S_ISDOOR (S_IFCHR));
-verify (!S_ISDOOR (S_IFDIR));
-verify (!S_ISDOOR (S_IFIFO));
-verify (!S_ISDOOR (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISDOOR (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISDOOR (S_IFSOCK));
-#endif
-
-verify (!S_ISMPB (S_IFBLK));
-verify (!S_ISMPB (S_IFCHR));
-verify (!S_ISMPB (S_IFDIR));
-verify (!S_ISMPB (S_IFIFO));
-verify (!S_ISMPB (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISMPB (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISMPB (S_IFSOCK));
-#endif
-
-verify (!S_ISNAM (S_IFBLK));
-verify (!S_ISNAM (S_IFCHR));
-verify (!S_ISNAM (S_IFDIR));
-verify (!S_ISNAM (S_IFIFO));
-verify (!S_ISNAM (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISNAM (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISNAM (S_IFSOCK));
-#endif
-
-verify (!S_ISNWK (S_IFBLK));
-verify (!S_ISNWK (S_IFCHR));
-verify (!S_ISNWK (S_IFDIR));
-verify (!S_ISNWK (S_IFIFO));
-verify (!S_ISNWK (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISNWK (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISNWK (S_IFSOCK));
-#endif
-
-verify (!S_ISPORT (S_IFBLK));
-verify (!S_ISPORT (S_IFCHR));
-verify (!S_ISPORT (S_IFDIR));
-verify (!S_ISPORT (S_IFIFO));
-verify (!S_ISPORT (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISPORT (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISPORT (S_IFSOCK));
-#endif
-
-verify (!S_ISCTG (S_IFBLK));
-verify (!S_ISCTG (S_IFCHR));
-verify (!S_ISCTG (S_IFDIR));
-verify (!S_ISCTG (S_IFIFO));
-verify (!S_ISCTG (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISCTG (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISCTG (S_IFSOCK));
-#endif
-
-verify (!S_ISOFD (S_IFBLK));
-verify (!S_ISOFD (S_IFCHR));
-verify (!S_ISOFD (S_IFDIR));
-verify (!S_ISOFD (S_IFIFO));
-verify (!S_ISOFD (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISOFD (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISOFD (S_IFSOCK));
-#endif
-
-verify (!S_ISOFL (S_IFBLK));
-verify (!S_ISOFL (S_IFCHR));
-verify (!S_ISOFL (S_IFDIR));
-verify (!S_ISOFL (S_IFIFO));
-verify (!S_ISOFL (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISOFL (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISOFL (S_IFSOCK));
-#endif
-
-verify (!S_ISWHT (S_IFBLK));
-verify (!S_ISWHT (S_IFCHR));
-verify (!S_ISWHT (S_IFDIR));
-verify (!S_ISWHT (S_IFIFO));
-verify (!S_ISWHT (S_IFREG));
-#ifdef S_IFLNK
-verify (!S_ISWHT (S_IFLNK));
-#endif
-#ifdef S_IFSOCK
-verify (!S_ISWHT (S_IFSOCK));
-#endif
-
-/* POSIX 2008 requires traditional encoding of permission constants. */
-verify (S_IRWXU == 00700);
-verify (S_IRUSR == 00400);
-verify (S_IWUSR == 00200);
-verify (S_IXUSR == 00100);
-verify (S_IRWXG == 00070);
-verify (S_IRGRP == 00040);
-verify (S_IWGRP == 00020);
-verify (S_IXGRP == 00010);
-verify (S_IRWXO == 00007);
-verify (S_IROTH == 00004);
-verify (S_IWOTH == 00002);
-verify (S_IXOTH == 00001);
-verify (S_ISUID == 04000);
-verify (S_ISGID == 02000);
-verify (S_ISVTX == 01000);
-
-#if ((0 <= UTIME_NOW && UTIME_NOW < 1000000000) \
- || (0 <= UTIME_OMIT && UTIME_OMIT < 1000000000) \
- || UTIME_NOW == UTIME_OMIT)
-invalid UTIME macros
-#endif
-
-/* Check the existence of some types. */
-nlink_t t1;
-
-struct timespec t2;
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/test-time-c++.cc b/gltests/test-time-c++.cc
deleted file mode 100644
index 501345f..0000000
--- a/gltests/test-time-c++.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Test of <time.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <time.h>
-
-#include "signature.h"
-
-
-#if GNULIB_NANOSLEEP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::nanosleep, int,
- (struct timespec const *, struct timespec *));
-#endif
-
-#if GNULIB_MKTIME
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime, time_t, (struct tm *));
-#endif
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_r, struct tm *,
- (time_t const *, struct tm *));
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime_r, struct tm *,
- (time_t const *, struct tm *));
-
-#if GNULIB_STRPTIME
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strptime, char *,
- (char const *, char const *, struct tm *));
-#endif
-
-#if GNULIB_TIMEGM
-SIGNATURE_CHECK (GNULIB_NAMESPACE::timegm, time_t, (struct tm *));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-time.c b/gltests/test-time.c
deleted file mode 100644
index 8e250bd..0000000
--- a/gltests/test-time.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Test of <time.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <time.h>
-
-#include "verify.h"
-
-struct timespec a;
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/test-unistd-c++.cc b/gltests/test-unistd-c++.cc
deleted file mode 100644
index 679ba85..0000000
--- a/gltests/test-unistd-c++.cc
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Test of <unistd.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <unistd.h>
-
-#include "signature.h"
-
-
-#if GNULIB_CHOWN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::chown, int, (const char *, uid_t, gid_t));
-#endif
-
-#if GNULIB_CLOSE
-SIGNATURE_CHECK (GNULIB_NAMESPACE::close, int, (int));
-#endif
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::dup, int, (int));
-
-#if GNULIB_DUP2
-SIGNATURE_CHECK (GNULIB_NAMESPACE::dup2, int, (int, int));
-#endif
-
-#if GNULIB_DUP3
-SIGNATURE_CHECK (GNULIB_NAMESPACE::dup3, int, (int, int, int));
-#endif
-
-#if GNULIB_EUIDACCESS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::euidaccess, int, (const char *, int));
-#endif
-
-#if GNULIB_FACCESSAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::faccessat, int,
- (int, char const *, int, int));
-#endif
-
-#if GNULIB_FCHDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fchdir, int, (int));
-#endif
-
-#if GNULIB_FCHOWNAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fchownat, int,
- (int, char const *, uid_t, gid_t, int));
-#endif
-
-#if GNULIB_FSYNC
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fsync, int, (int));
-#endif
-
-#if GNULIB_FTRUNCATE
-SIGNATURE_CHECK (GNULIB_NAMESPACE::ftruncate, int, (int, off_t));
-#endif
-
-#if GNULIB_GETCWD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getcwd, char *, (char *, size_t));
-#endif
-
-#if GNULIB_GETDOMAINNAME
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getdomainname, int, (char *, size_t));
-#endif
-
-#if GNULIB_GETDTABLESIZE
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getdtablesize, int, (void));
-#endif
-
-#if GNULIB_GETGROUPS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getgroups, int, (int, gid_t *));
-#endif
-
-#if GNULIB_GETHOSTNAME
-SIGNATURE_CHECK (GNULIB_NAMESPACE::gethostname, int, (char *, size_t));
-#endif
-
-#if GNULIB_GETLOGIN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getlogin, char *, (void));
-#endif
-
-#if GNULIB_GETLOGIN_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getlogin_r, int, (char *, size_t));
-#endif
-
-#if GNULIB_GETPAGESIZE
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getpagesize, int, (void));
-#endif
-
-#if GNULIB_GETUSERSHELL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::getusershell, char *, (void));
-#endif
-
-#if GNULIB_GETUSERSHELL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::setusershell, void, (void));
-#endif
-
-#if GNULIB_GETUSERSHELL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::endusershell, void, (void));
-#endif
-
-#if GNULIB_LCHOWN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::lchown, int, (char const *, uid_t, gid_t));
-#endif
-
-#if GNULIB_LINK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::link, int, (const char *, const char *));
-#endif
-
-#if GNULIB_LINKAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::linkat, int,
- (int, const char *, int, const char *, int));
-#endif
-
-#if GNULIB_LSEEK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::lseek, off_t, (int, off_t, int));
-#endif
-
-#if GNULIB_PIPE2
-SIGNATURE_CHECK (GNULIB_NAMESPACE::pipe2, int, (int[2], int));
-#endif
-
-#if GNULIB_PREAD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::pread, ssize_t,
- (int, void *, size_t, off_t));
-#endif
-
-#if GNULIB_READLINK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::readlink, ssize_t,
- (const char *, char *, size_t));
-#endif
-
-#if GNULIB_READLINKAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::readlinkat, ssize_t,
- (int, char const *, char *, size_t));
-#endif
-
-#if GNULIB_RMDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::rmdir, int, (char const *));
-#endif
-
-#if GNULIB_SLEEP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::sleep, unsigned int, (unsigned int));
-#endif
-
-#if GNULIB_SYMLINK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::symlink, int, (char const *, char const *));
-#endif
-
-#if GNULIB_SYMLINKAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::symlinkat, int,
- (char const *, int, char const *));
-#endif
-
-#if GNULIB_UNLINK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::unlink, int, (char const *));
-#endif
-
-#if GNULIB_UNLINKAT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::unlinkat, int, (int, char const *, int));
-#endif
-
-#if GNULIB_USLEEP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::usleep, int, (useconds_t));
-#endif
-
-#if GNULIB_WRITE
-SIGNATURE_CHECK (GNULIB_NAMESPACE::write, ssize_t,
- (int, const void *, size_t));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-unistd.c b/gltests/test-unistd.c
deleted file mode 100644
index ec02eee..0000000
--- a/gltests/test-unistd.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Test of <unistd.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <unistd.h>
-
-#include "verify.h"
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-/* Check that the various SEEK_* macros are defined. */
-int sk[] = { SEEK_CUR, SEEK_END, SEEK_SET };
-
-/* Check that the various *_FILENO macros are defined. */
-#if ! (defined STDIN_FILENO \
- && (STDIN_FILENO + STDOUT_FILENO + STDERR_FILENO == 3))
-missing or broken *_FILENO macros
-#endif
-
-/* Check that the types are all defined. */
-size_t t1;
-ssize_t t2;
-#ifdef TODO /* Not implemented in gnulib yet */
-uid_t t3;
-gid_t t4;
-#endif
-off_t t5;
-pid_t t6;
-#ifdef TODO
-useconds_t t7;
-intptr_t t8;
-#endif
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/test-wchar-c++.cc b/gltests/test-wchar-c++.cc
deleted file mode 100644
index 7cfce9b..0000000
--- a/gltests/test-wchar-c++.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Test of <wchar.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <wchar.h>
-
-#include "signature.h"
-
-
-#if GNULIB_BTOWC
-SIGNATURE_CHECK (GNULIB_NAMESPACE::btowc, wint_t, (int));
-#endif
-
-#if GNULIB_WCTOB
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wctob, int, (wint_t));
-#endif
-
-#if GNULIB_MBSINIT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsinit, int, (const mbstate_t *));
-#endif
-
-#if GNULIB_MBRTOWC
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtowc, size_t,
- (wchar_t *, const char *, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBRLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrlen, size_t,
- (const char *, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBSRTOWCS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtowcs, size_t,
- (wchar_t *, const char **, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBSNRTOWCS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsnrtowcs, size_t,
- (wchar_t *, const char **, size_t, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCRTOMB
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcrtomb, size_t,
- (char *, wchar_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCSRTOMBS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsrtombs, size_t,
- (char *, const wchar_t **, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCSNRTOMBS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t,
- (char *, const wchar_t **, size_t, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCWIDTH
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/gltests/test-wchar.c b/gltests/test-wchar.c
deleted file mode 100644
index 2a03d6b..0000000
--- a/gltests/test-wchar.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Test of <wchar.h> substitute.
- Copyright (C) 2007-2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <wchar.h>
-
-#include "verify.h"
-
-/* Check that the types wchar_t and wint_t are defined. */
-wchar_t a = 'c';
-wint_t b = 'x';
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/gltests/time.in.h b/gltests/time.in.h
index 1f6e4a8..2bd6338 100644
--- a/gltests/time.in.h
+++ b/gltests/time.in.h
@@ -108,36 +108,38 @@ _GL_CXXALIASWARN (mktime);
/* Convert TIMER to RESULT, assuming local time and UTC respectively. See
<http://www.opengroup.org/susv3xsh/localtime_r.html> and
<http://www.opengroup.org/susv3xsh/gmtime_r.html>. */
-# if @REPLACE_LOCALTIME_R@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef localtime_r
-# define localtime_r rpl_localtime_r
-# endif
+# if @GNULIB_TIME_R@
+# if @REPLACE_LOCALTIME_R@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef localtime_r
+# define localtime_r rpl_localtime_r
+# endif
_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result)
_GL_ARG_NONNULL ((1, 2)));
_GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result));
-# else
+# else
_GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result));
-# endif
-_GL_CXXALIASWARN (localtime_r);
-# if @REPLACE_LOCALTIME_R@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef gmtime_r
-# define gmtime_r rpl_gmtime_r
# endif
+_GL_CXXALIASWARN (localtime_r);
+# if @REPLACE_LOCALTIME_R@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+# undef gmtime_r
+# define gmtime_r rpl_gmtime_r
+# endif
_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result)
_GL_ARG_NONNULL ((1, 2)));
_GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result));
-# else
+# else
_GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
struct tm *restrict __result));
-# endif
+# endif
_GL_CXXALIASWARN (gmtime_r);
+# endif
/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
the resulting broken-down time into TM. See
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index 555132f..b452113 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -9,7 +9,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=lib/gl/override
--lib=libgnu --source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc
--tests-base=lib/gltests --aux-dir=build-aux --with-tests --lgpl=2 --libtool
--macro-prefix=lgl --no-vc-files gettext-h lib-msvc-compat lib-symbol-versions
lib-symbol-visibility stdint striconv strverscmp
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=lib/gl/override
--lib=libgnu --source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc
--tests-base=lib/gltests --aux-dir=build-aux --with-tests --avoid=iconv-h-tests
--avoid=string-tests --avoid=wchar-tests --lgpl=2 --libtool --macro-prefix=lgl
--no-vc-files gettext-h lib-msvc-compat lib-symbol-versions
lib-symbol-visibility stdint striconv strverscmp
AUTOMAKE_OPTIONS = 1.5 gnits
diff --git a/lib/gl/m4/ansi-c++.m4 b/lib/gl/m4/ansi-c++.m4
deleted file mode 100644
index 6066261..0000000
--- a/lib/gl/m4/ansi-c++.m4
+++ /dev/null
@@ -1,85 +0,0 @@
-# ansi-c++.m4 serial 2
-dnl Copyright (C) 2002-2003, 2010 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-# gl_PROG_ANSI_CXX([ANSICXX_VARIABLE], [ANSICXX_CONDITIONAL])
-# Sets ANSICXX_VARIABLE to the name of a sufficiently ANSI C++ compliant
-# compiler, or to ":" if none is found.
-# Defines the Automake condition ANSICXX_CONDITIONAL to true if such a compiler
-# was found, or to false if not.
-
-AC_DEFUN([gl_PROG_ANSI_CXX],
-[
- m4_if([$1], [CXX], [],
- [gl_save_CXX="$CXX"])
- if test -z "$CXX"; then
- if test -n "$CCC"; then
- CXX="$CCC"
- else
- AC_CHECK_PROGS([CXX], [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r
xlC], [:])
- fi
- fi
- if test "$CXX" != ":"; then
- dnl Use a modified version of AC_PROG_CXX_WORKS that does not exit
- dnl upon failure.
- AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
- AC_LANG_PUSH([C++])
- AC_ARG_VAR([CXX], [C++ compiler command])
- AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])
- echo 'int main () { return 0; }' > conftest.$ac_ext
- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- gl_cv_prog_ansicxx_works=yes
- if (./conftest; exit) 2>/dev/null; then
- gl_cv_prog_ansicxx_cross=no
- else
- gl_cv_prog_ansicxx_cross=yes
- fi
- else
- gl_cv_prog_ansicxx_works=no
- fi
- rm -fr conftest*
- AC_LANG_POP([C++])
- AC_MSG_RESULT([$gl_cv_prog_ansicxx_works])
- if test $gl_cv_prog_ansicxx_works = no; then
- CXX=:
- else
- dnl Test for namespaces.
- dnl We don't bother supporting pre-ANSI-C++ compilers.
- AC_MSG_CHECKING([whether the C++ compiler supports namespaces])
- AC_LANG_PUSH([C++])
- cat <<EOF > conftest.$ac_ext
-#include <iostream>
-namespace test { using namespace std; }
-std::ostream* ptr;
-int main () { return 0; }
-EOF
- if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
- gl_cv_prog_ansicxx_namespaces=yes
- else
- gl_cv_prog_ansicxx_namespaces=no
- fi
- rm -fr conftest*
- AC_LANG_POP([C++])
- AC_MSG_RESULT([$gl_cv_prog_ansicxx_namespaces])
- if test $gl_cv_prog_ansicxx_namespaces = no; then
- CXX=:
- fi
- fi
- fi
- m4_if([$1], [CXX], [],
- [$1="$CXX"
- CXX="$gl_save_CXX"])
- AC_SUBST([$1])
-
- AM_CONDITIONAL([$2], [test "$$1" != ":"])
-
- dnl This macro invocation resolves an automake error:
- dnl /usr/local/share/automake-1.11/am/depend2.am: am__fastdepCXX does not
appear in AM_CONDITIONAL
- dnl /usr/local/share/automake-1.11/am/depend2.am: The usual way to define
`am__fastdepCXX' is to add `AC_PROG_CXX'
- dnl /usr/local/share/automake-1.11/am/depend2.am: to `configure.ac' and
run `aclocal' and `autoconf' again.
- _AM_DEPENDENCIES([CXX])
-])
diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index c61a1b0..fb111f2 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=lib/gl/override --lib=libgnu
--source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc
--tests-base=lib/gltests --aux-dir=build-aux --with-tests --lgpl=2 --libtool
--macro-prefix=lgl --no-vc-files gettext-h lib-msvc-compat lib-symbol-versions
lib-symbol-visibility stdint striconv strverscmp
+# gnulib-tool --import --dir=. --local-dir=lib/gl/override --lib=libgnu
--source-base=lib/gl --m4-base=lib/gl/m4 --doc-base=doc
--tests-base=lib/gltests --aux-dir=build-aux --with-tests --avoid=iconv-h-tests
--avoid=string-tests --avoid=wchar-tests --lgpl=2 --libtool --macro-prefix=lgl
--no-vc-files gettext-h lib-msvc-compat lib-symbol-versions
lib-symbol-visibility stdint striconv strverscmp
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([lib/gl/override])
@@ -28,7 +28,7 @@ gl_MODULES([
striconv
strverscmp
])
-gl_AVOID([])
+gl_AVOID([iconv-h-tests string-tests wchar-tests])
gl_SOURCE_BASE([lib/gl])
gl_M4_BASE([lib/gl/m4])
gl_PO_BASE([])
diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 9aa58e7..0e07e87 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -25,7 +25,6 @@ AC_DEFUN([lgl_EARLY],
m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
AC_REQUIRE([AC_PROG_RANLIB])
- # Code from module ansi-c++-opt:
# Code from module arg-nonnull:
# Code from module c++defs:
# Code from module c-ctype:
@@ -39,7 +38,6 @@ AC_DEFUN([lgl_EARLY],
# Code from module havelib:
# Code from module iconv:
# Code from module iconv-h:
- # Code from module iconv-h-tests:
# Code from module iconv-tests:
# Code from module iconv_open:
# Code from module include_next:
@@ -57,13 +55,11 @@ AC_DEFUN([lgl_EARLY],
# Code from module striconv:
# Code from module striconv-tests:
# Code from module string:
- # Code from module string-tests:
# Code from module strverscmp:
# Code from module strverscmp-tests:
# Code from module verify:
# Code from module warn-on-use:
# Code from module wchar:
- # Code from module wchar-tests:
])
# This macro should be invoked from ./configure.ac, in the section
@@ -163,7 +159,6 @@ AC_DEFUN([lgl_INIT],
m4_pushdef([lgltests_LIBSOURCES_DIR], [])
gl_COMMON
gl_source_base='lib/gltests'
- gl_PROG_ANSI_CXX([CXX], [ANSICXX])
gt_LOCALE_FR
gt_LOCALE_TR_UTF8
gt_TYPE_WCHAR_T
@@ -285,7 +280,6 @@ AC_DEFUN([lgl_FILE_LIST], [
lib/strverscmp.c
lib/wchar.in.h
m4/00gnulib.m4
- m4/ansi-c++.m4
m4/codeset.m4
m4/extensions.m4
m4/gnulib-common.m4
@@ -318,18 +312,12 @@ AC_DEFUN([lgl_FILE_LIST], [
tests/test-c-strcase.sh
tests/test-c-strcasecmp.c
tests/test-c-strncasecmp.c
- tests/test-iconv-h-c++.cc
- tests/test-iconv-h.c
tests/test-iconv.c
tests/test-stdbool.c
tests/test-stddef.c
tests/test-stdint.c
tests/test-striconv.c
- tests/test-string-c++.cc
- tests/test-string.c
tests/test-strverscmp.c
- tests/test-wchar-c++.cc
- tests/test-wchar.c
tests=lib/dummy.c
tests=lib/intprops.h
tests=lib/verify.h
diff --git a/lib/gl/string.in.h b/lib/gl/string.in.h
index c44bbce..46d609d 100644
--- a/lib/gl/string.in.h
+++ b/lib/gl/string.in.h
@@ -73,7 +73,14 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
void *, (void const *__s, int __c, size_t __n),
void const *, (void const *__s, int __c, size_t __n));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n));
+_GL_CXXALIASWARN1 (memchr, void const *,
+ (void const *__s, int __c, size_t __n));
+# else
_GL_CXXALIASWARN (memchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef memchr
/* Assume memchr is always declared. */
@@ -149,7 +156,13 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int,
size_t)
_GL_CXXALIAS_SYS_CAST2 (memrchr,
void *, (void const *, int, size_t),
void const *, (void const *, int, size_t));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t));
+_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t));
+# else
_GL_CXXALIASWARN (memrchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef memrchr
# if HAVE_RAW_DECL_MEMRCHR
@@ -173,7 +186,13 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int
__c_in)
_GL_CXXALIAS_SYS_CAST2 (rawmemchr,
void *, (void const *__s, int __c_in),
void const *, (void const *__s, int __c_in));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in));
+_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in));
+# else
_GL_CXXALIASWARN (rawmemchr);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef rawmemchr
# if HAVE_RAW_DECL_RAWMEMCHR
@@ -251,7 +270,13 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int
__c_in)
_GL_CXXALIAS_SYS_CAST2 (strchrnul,
char *, (char const *__s, int __c_in),
char const *, (char const *__s, int __c_in));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in));
+_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in));
+# else
_GL_CXXALIASWARN (strchrnul);
+# endif
#elif defined GNULIB_POSIXCHECK
# undef strchrnul
# if HAVE_RAW_DECL_STRCHRNUL
@@ -354,7 +379,14 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char
const *__accept)
_GL_CXXALIAS_SYS_CAST2 (strpbrk,
char *, (char const *__s, char const *__accept),
const char *, (char const *__s, char const *__accept));
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept));
+_GL_CXXALIASWARN1 (strpbrk, char const *,
+ (char const *__s, char const *__accept));
+# else
_GL_CXXALIASWARN (strpbrk);
+# endif
# if defined GNULIB_POSIXCHECK
/* strpbrk() assumes the second argument is a list of single-byte characters.
Even in this simple case, it does not work with multibyte strings if the
@@ -449,7 +481,14 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
char *, (const char *haystack, const char *needle),
const char *, (const char *haystack, const char
*needle));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle));
+_GL_CXXALIASWARN1 (strstr, const char *,
+ (const char *haystack, const char *needle));
+# else
_GL_CXXALIASWARN (strstr);
+# endif
#elif defined GNULIB_POSIXCHECK
/* strstr() does not work with multibyte strings if the locale encoding is
different from UTF-8:
@@ -489,7 +528,14 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
char *, (const char *haystack, const char *needle),
const char *, (const char *haystack, const char
*needle));
# endif
+# if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 10 \
+ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle));
+_GL_CXXALIASWARN1 (strcasestr, const char *,
+ (const char *haystack, const char *needle));
+# else
_GL_CXXALIASWARN (strcasestr);
+# endif
#elif defined GNULIB_POSIXCHECK
/* strcasestr() does not work with multibyte strings:
It is a glibc extension, and glibc implements it only for unibyte
diff --git a/lib/gltests/Makefile.am b/lib/gltests/Makefile.am
index 9d98adf..b6fabf4 100644
--- a/lib/gltests/Makefile.am
+++ b/lib/gltests/Makefile.am
@@ -111,20 +111,6 @@ EXTRA_DIST += test-c-strcase.sh test-c-strcasecmp.c
test-c-strncasecmp.c macros.
## end gnulib module c-strcase-tests
-## begin gnulib module iconv-h-tests
-
-TESTS += test-iconv-h
-check_PROGRAMS += test-iconv-h
-if ANSICXX
-TESTS += test-iconv-h-c++
-check_PROGRAMS += test-iconv-h-c++
-test_iconv_h_c___SOURCES = test-iconv-h-c++.cc
-test_iconv_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBICONV)
-endif
-EXTRA_DIST += test-iconv-h.c test-iconv-h-c++.cc signature.h
-
-## end gnulib module iconv-h-tests
-
## begin gnulib module iconv-tests
TESTS += test-iconv
@@ -176,20 +162,6 @@ EXTRA_DIST += test-striconv.c macros.h
## end gnulib module striconv-tests
-## begin gnulib module string-tests
-
-TESTS += test-string
-check_PROGRAMS += test-string
-if ANSICXX
-TESTS += test-string-c++
-check_PROGRAMS += test-string-c++
-test_string_c___SOURCES = test-string-c++.cc
-test_string_c___LDADD = $(LDADD) $(LIBINTL)
-endif
-EXTRA_DIST += test-string.c test-string-c++.cc signature.h
-
-## end gnulib module string-tests
-
## begin gnulib module strverscmp-tests
TESTS += test-strverscmp
@@ -223,20 +195,6 @@ EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
## end gnulib module warn-on-use
-## begin gnulib module wchar-tests
-
-TESTS += test-wchar
-check_PROGRAMS += test-wchar
-if ANSICXX
-TESTS += test-wchar-c++
-check_PROGRAMS += test-wchar-c++
-test_wchar_c___SOURCES = test-wchar-c++.cc
-test_wchar_c___LDADD = $(LDADD) $(LIBINTL)
-endif
-EXTRA_DIST += test-wchar.c test-wchar-c++.cc signature.h
-
-## end gnulib module wchar-tests
-
## begin gnulib module dummy
libtests_a_SOURCES += dummy.c
diff --git a/lib/gltests/test-iconv-h-c++.cc b/lib/gltests/test-iconv-h-c++.cc
deleted file mode 100644
index f007582..0000000
--- a/lib/gltests/test-iconv-h-c++.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Test of <iconv.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#if HAVE_ICONV
-# include <iconv.h>
-
-# ifndef ICONV_CONST
-# define ICONV_CONST /* empty */
-# endif
-
-# include "signature.h"
-
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv_open, iconv_t,
- (const char *, const char *));
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv, size_t,
- (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *));
-
-SIGNATURE_CHECK (GNULIB_NAMESPACE::iconv_close, int, (iconv_t));
-
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/lib/gltests/test-iconv-h.c b/lib/gltests/test-iconv-h.c
deleted file mode 100644
index 10a8e3d..0000000
--- a/lib/gltests/test-iconv-h.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Test of <iconv.h> substitute.
- Copyright (C) 2007-2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#if HAVE_ICONV
-# include <iconv.h>
-
-# ifndef ICONV_CONST
-# define ICONV_CONST /* empty */
-# endif
-#endif
-
-int
-main ()
-{
- return 0;
-}
diff --git a/lib/gltests/test-string-c++.cc b/lib/gltests/test-string-c++.cc
deleted file mode 100644
index 075f78d..0000000
--- a/lib/gltests/test-string-c++.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Test of <string.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <string.h>
-
-#include "signature.h"
-
-
-#if GNULIB_MEMCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
- (void const *, int, size_t));
-#endif
-
-//SIGNATURE_CHECK (GNULIB_NAMESPACE::memcmp, int,
-// (void const *, void const *, size_t));
-
-#if GNULIB_MEMMEM
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memmem, void *,
- (void const *, size_t, void const *, size_t));
-#endif
-
-#if GNULIB_MEMPCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mempcpy, void *,
- (void *, void const *, size_t));
-#endif
-
-#if GNULIB_MEMRCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::memrchr, void *,
- (void const *, int, size_t));
-#endif
-
-#if GNULIB_RAWMEMCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::rawmemchr, void *, (void const *, int));
-#endif
-
-#if GNULIB_STPCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::stpcpy, char *, (char *, char const *));
-#endif
-
-#if GNULIB_STPNCPY
-SIGNATURE_CHECK (GNULIB_NAMESPACE::stpncpy, char *,
- (char *, char const *, size_t));
-#endif
-
-#if GNULIB_STRCHRNUL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strchrnul, char *, (char const *, int));
-#endif
-
-#if GNULIB_STRDUP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strdup, char *, (char const *));
-#endif
-
-#if GNULIB_STRNDUP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strndup, char *, (char const *, size_t));
-#endif
-
-#if GNULIB_STRNLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strnlen, size_t, (char const *, size_t));
-#endif
-
-#if GNULIB_STRPBRK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strpbrk, char *,
- (char const *, char const *));
-#endif
-
-#if GNULIB_STRSEP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strsep, char *, (char **, char const *));
-#endif
-
-#if GNULIB_STRSTR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strstr, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRCASESTR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strcasestr, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRTOK_R
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strtok_r, char *,
- (char *, char const *, char **));
-#endif
-
-#if GNULIB_MBSLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbslen, size_t, (const char *));
-#endif
-
-#if GNULIB_MBSCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbschr, char *, (const char *, int));
-#endif
-
-#if GNULIB_MBSRCHR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrchr, char *, (const char *, int));
-#endif
-
-#if GNULIB_MBSPBRK
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbspbrk, char *,
- (const char *, const char *));
-#endif
-
-#if GNULIB_STRERROR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strerror, char *, (int));
-#endif
-
-#if GNULIB_STRSIGNAL
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strsignal, char *, (int));
-#endif
-
-#if GNULIB_STRVERSCMP
-SIGNATURE_CHECK (GNULIB_NAMESPACE::strverscmp, int,
- (const char *, const char *));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/lib/gltests/test-string.c b/lib/gltests/test-string.c
deleted file mode 100644
index 019a817..0000000
--- a/lib/gltests/test-string.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test of <string.h> substitute.
- Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "verify.h"
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- return 0;
-}
diff --git a/lib/gltests/test-wchar-c++.cc b/lib/gltests/test-wchar-c++.cc
deleted file mode 100644
index 7cfce9b..0000000
--- a/lib/gltests/test-wchar-c++.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Test of <wchar.h> substitute in C++ mode.
- Copyright (C) 2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <wchar.h>
-
-#include "signature.h"
-
-
-#if GNULIB_BTOWC
-SIGNATURE_CHECK (GNULIB_NAMESPACE::btowc, wint_t, (int));
-#endif
-
-#if GNULIB_WCTOB
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wctob, int, (wint_t));
-#endif
-
-#if GNULIB_MBSINIT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsinit, int, (const mbstate_t *));
-#endif
-
-#if GNULIB_MBRTOWC
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrtowc, size_t,
- (wchar_t *, const char *, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBRLEN
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbrlen, size_t,
- (const char *, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBSRTOWCS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrtowcs, size_t,
- (wchar_t *, const char **, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_MBSNRTOWCS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsnrtowcs, size_t,
- (wchar_t *, const char **, size_t, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCRTOMB
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcrtomb, size_t,
- (char *, wchar_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCSRTOMBS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsrtombs, size_t,
- (char *, const wchar_t **, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCSNRTOMBS
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsnrtombs, size_t,
- (char *, const wchar_t **, size_t, size_t, mbstate_t *));
-#endif
-
-#if GNULIB_WCWIDTH
-SIGNATURE_CHECK (GNULIB_NAMESPACE::wcwidth, int, (wchar_t));
-#endif
-
-
-int
-main ()
-{
-}
diff --git a/lib/gltests/test-wchar.c b/lib/gltests/test-wchar.c
deleted file mode 100644
index 2a03d6b..0000000
--- a/lib/gltests/test-wchar.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Test of <wchar.h> substitute.
- Copyright (C) 2007-2010 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <address@hidden>, 2007. */
-
-#include <config.h>
-
-#include <wchar.h>
-
-#include "verify.h"
-
-/* Check that the types wchar_t and wint_t are defined. */
-wchar_t a = 'c';
-wint_t b = 'x';
-
-/* Check that NULL can be passed through varargs as a pointer type,
- per POSIX 2008. */
-verify (sizeof NULL == sizeof (void *));
-
-int
-main (void)
-{
- return 0;
-}
hooks/post-receive
--
GNU libidn
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libidn branch, master, updated. libidn-1-18-16-g1fc2c2d,
Simon Josefsson <=