X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-string-c%2B%2B.cc;h=df213939a9e781fae9235683d624c89644e34d72;hb=fac94349f25305566277d15b965fa8f4efe66613;hp=075f78db80ed4de558976a37cad38033eb84d66e;hpb=b06e5c5dd06c48e702e52560122a1f9ad934679e;p=gnulib.git

diff --git a/tests/test-string-c++.cc b/tests/test-string-c++.cc
index 075f78db8..df213939a 100644
--- a/tests/test-string-c++.cc
+++ b/tests/test-string-c++.cc
@@ -1,5 +1,5 @@
 /* Test of <string.h> substitute in C++ mode.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2011 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
@@ -24,7 +24,7 @@
 #include "signature.h"
 
 
-#if GNULIB_MEMCHR
+#if GNULIB_TEST_MEMCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
                  (void const *, int, size_t));
 #endif
@@ -32,100 +32,109 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::memchr, void *,
 //SIGNATURE_CHECK (GNULIB_NAMESPACE::memcmp, int,
 //                 (void const *, void const *, size_t));
 
-#if GNULIB_MEMMEM
+#if GNULIB_TEST_MEMMEM
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memmem, void *,
                  (void const *, size_t, void const *, size_t));
 #endif
 
-#if GNULIB_MEMPCPY
+#if GNULIB_TEST_MEMPCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mempcpy, void *,
                  (void *, void const *, size_t));
 #endif
 
-#if GNULIB_MEMRCHR
+#if GNULIB_TEST_MEMRCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::memrchr, void *,
                  (void const *, int, size_t));
 #endif
 
-#if GNULIB_RAWMEMCHR
+#if GNULIB_TEST_RAWMEMCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::rawmemchr, void *, (void const *, int));
 #endif
 
-#if GNULIB_STPCPY
+#if GNULIB_TEST_STPCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::stpcpy, char *, (char *, char const *));
 #endif
 
-#if GNULIB_STPNCPY
+#if GNULIB_TEST_STPNCPY
 SIGNATURE_CHECK (GNULIB_NAMESPACE::stpncpy, char *,
                  (char *, char const *, size_t));
 #endif
 
-#if GNULIB_STRCHRNUL
+#if GNULIB_TEST_STRCHRNUL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strchrnul, char *, (char const *, int));
 #endif
 
-#if GNULIB_STRDUP
+#if GNULIB_TEST_STRDUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strdup, char *, (char const *));
 #endif
 
-#if GNULIB_STRNDUP
+#if GNULIB_TEST_STRNCAT
+SIGNATURE_CHECK (GNULIB_NAMESPACE::strncat, char *,
+                 (char *, const char *, size_t));
+#endif
+
+#if GNULIB_TEST_STRNDUP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strndup, char *, (char const *, size_t));
 #endif
 
-#if GNULIB_STRNLEN
+#if GNULIB_TEST_STRNLEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strnlen, size_t, (char const *, size_t));
 #endif
 
-#if GNULIB_STRPBRK
+#if GNULIB_TEST_STRPBRK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strpbrk, char *,
                  (char const *, char const *));
 #endif
 
-#if GNULIB_STRSEP
+#if GNULIB_TEST_STRSEP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strsep, char *, (char **, char const *));
 #endif
 
-#if GNULIB_STRSTR
+#if GNULIB_TEST_STRSTR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strstr, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRCASESTR
+#if GNULIB_TEST_STRCASESTR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strcasestr, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRTOK_R
+#if GNULIB_TEST_STRTOK_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strtok_r, char *,
                  (char *, char const *, char **));
 #endif
 
-#if GNULIB_MBSLEN
+#if GNULIB_TEST_MBSLEN
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbslen, size_t, (const char *));
 #endif
 
-#if GNULIB_MBSCHR
+#if GNULIB_TEST_MBSCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbschr, char *, (const char *, int));
 #endif
 
-#if GNULIB_MBSRCHR
+#if GNULIB_TEST_MBSRCHR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbsrchr, char *, (const char *, int));
 #endif
 
-#if GNULIB_MBSPBRK
+#if GNULIB_TEST_MBSPBRK
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mbspbrk, char *,
                  (const char *, const char *));
 #endif
 
-#if GNULIB_STRERROR
+#if GNULIB_TEST_STRERROR
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strerror, char *, (int));
 #endif
 
-#if GNULIB_STRSIGNAL
+#if GNULIB_TEST_STRERROR_R
+SIGNATURE_CHECK (GNULIB_NAMESPACE::strerror_r, int, (int, char *, size_t));
+#endif
+
+#if GNULIB_TEST_STRSIGNAL
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strsignal, char *, (int));
 #endif
 
-#if GNULIB_STRVERSCMP
+#if GNULIB_TEST_STRVERSCMP
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strverscmp, int,
                  (const char *, const char *));
 #endif