[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU libidn branch, master, updated. libidn-1-18-11-gf452932
|
From: |
Simon Josefsson |
|
Subject: |
[SCM] GNU libidn branch, master, updated. libidn-1-18-11-gf452932 |
|
Date: |
Fri, 12 Mar 2010 12:31:30 +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=f452932a557038ebe0d78e10df74bf70cbad87b0
The branch, master has been updated
via f452932a557038ebe0d78e10df74bf70cbad87b0 (commit)
via 5e4cc913e75bf275f11d81e42aed911f3aafee4c (commit)
from 08472e57cf50c58d9e7feb22086130ff856286ac (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 f452932a557038ebe0d78e10df74bf70cbad87b0
Author: Simon Josefsson <address@hidden>
Date: Fri Mar 12 13:31:26 2010 +0100
Update gnulib files.
commit 5e4cc913e75bf275f11d81e42aed911f3aafee4c
Author: Simon Josefsson <address@hidden>
Date: Tue Mar 9 16:49:20 2010 +0100
Explain deprecated libtool usage.
-----------------------------------------------------------------------
Summary of changes:
build-aux/c++defs.h | 9 ++++++-
configure.ac | 8 +++++-
gl/string.in.h | 58 +++++++++++++++++++++++++++++---------------------
lib/gl/string.in.h | 58 +++++++++++++++++++++++++++++---------------------
4 files changed, 81 insertions(+), 52 deletions(-)
diff --git a/build-aux/c++defs.h b/build-aux/c++defs.h
index 78166d2..7099897 100644
--- a/build-aux/c++defs.h
+++ b/build-aux/c++defs.h
@@ -176,16 +176,21 @@
are used to silence the "cannot find a match" and "invalid conversion"
errors that would otherwise occur. */
#if defined __cplusplus && defined GNULIB_NAMESPACE
+ /* The outer cast must be a reinterpret_cast.
+ The inner cast: When the function is defined as a set of overloaded
+ functions, it works as a static_cast<>, choosing the designated variant.
+ When the function is defined as a single variant, it works as a
+ reinterpret_cast<>. The parenthesized cast syntax works both ways. */
# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
namespace GNULIB_NAMESPACE \
{ \
static rettype (*func) parameters = \
reinterpret_cast<rettype(*)parameters>( \
- reinterpret_cast<rettype2(*)parameters2>(::func)); \
+ (rettype2(*)parameters2)(::func)); \
} \
_GL_EXTERN_C int _gl_cxxalias_dummy
#else
-# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
_GL_EXTERN_C int _gl_cxxalias_dummy
#endif
diff --git a/configure.ac b/configure.ac
index 888fcac..5654796 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,12 +38,16 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
AC_CONFIG_HEADERS(config.h)
-# Checks for programs.
+# We can't replace this with LT_INIT([win32-dll]) yet. For example,
+# the Ubuntu 8.04 LTS is still shipping a libtool version that doesn't
+# have it.
AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+# Checks for programs.
AC_PROG_CC
lgl_EARLY
gl_EARLY
-AC_PROG_LIBTOOL
AM_MISSING_PROG(PERL, perl, $missing_dir)
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AM_GNU_GETTEXT(external)
diff --git a/gl/string.in.h b/gl/string.in.h
index 2463417..1af8943 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -66,19 +66,12 @@ _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int
__c, size_t __n)
_GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
# else
-# if defined __SUNPRO_CC
- /* This compiler defines an overloaded function
+ /* On some systems, this function is defined as an overloaded function:
extern "C" { const void * std::memchr (const void *, int, size_t); }
- extern "C++" { inline void * std::memchr (void *, int, size_t); }
- and diagnoses an error
- "Error: Could not find a match for std::memchr(const void*, int,
unsigned)"
- */
+ extern "C++" { void * std::memchr (void *, int, size_t); } */
_GL_CXXALIAS_SYS_CAST2 (memchr,
void *, (void const *__s, int __c, size_t __n),
void const *, (void const *__s, int __c, size_t __n));
-# else
-_GL_CXXALIAS_SYS (memchr, void *, (void const *__s, int __c, size_t __n));
-# endif
# endif
_GL_CXXALIASWARN (memchr);
#elif defined GNULIB_POSIXCHECK
@@ -150,7 +143,12 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int,
size_t)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (memrchr, void *, (void const *, int, size_t));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const void * std::memrchr (const void *, int, size_t); }
+ extern "C++" { void * std::memrchr (void *, int, size_t); } */
+_GL_CXXALIAS_SYS_CAST2 (memrchr,
+ void *, (void const *, int, size_t),
+ void const *, (void const *, int, size_t));
_GL_CXXALIASWARN (memrchr);
#elif defined GNULIB_POSIXCHECK
# undef memrchr
@@ -169,7 +167,12 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int
__c_in)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (rawmemchr, void *, (void const *__s, int __c_in));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const void * std::rawmemchr (const void *, int); }
+ extern "C++" { void * std::rawmemchr (void *, int); } */
+_GL_CXXALIAS_SYS_CAST2 (rawmemchr,
+ void *, (void const *__s, int __c_in),
+ void const *, (void const *__s, int __c_in));
_GL_CXXALIASWARN (rawmemchr);
#elif defined GNULIB_POSIXCHECK
# undef rawmemchr
@@ -242,7 +245,12 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int
__c_in)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (strchrnul, char *, (char const *__s, int __c_in));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * std::strchrnul (const char *, int); }
+ extern "C++" { char * std::strchrnul (char *, int); } */
+_GL_CXXALIAS_SYS_CAST2 (strchrnul,
+ char *, (char const *__s, int __c_in),
+ char const *, (char const *__s, int __c_in));
_GL_CXXALIASWARN (strchrnul);
#elif defined GNULIB_POSIXCHECK
# undef strchrnul
@@ -340,19 +348,12 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char
const *__accept)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1, 2)));
# endif
-# if defined __SUNPRO_CC
- /* This compiler defines an overloaded function
+ /* On some systems, this function is defined as an overloaded function:
extern "C" { const char * strpbrk (const char *, const char *); }
- extern "C++" { inline char * strpbrk (char *, const char *); }
- and diagnoses an error
- "Error: Could not find a match for std::strpbrk(const char*, const char*)"
- */
+ extern "C++" { char * strpbrk (char *, const char *); } */
_GL_CXXALIAS_SYS_CAST2 (strpbrk,
char *, (char const *__s, char const *__accept),
const char *, (char const *__s, char const *__accept));
-# else
-_GL_CXXALIAS_SYS (strpbrk, char *, (char const *__s, char const *__accept));
-# endif
_GL_CXXALIASWARN (strpbrk);
# if defined GNULIB_POSIXCHECK
/* strpbrk() assumes the second argument is a list of single-byte characters.
@@ -441,7 +442,12 @@ _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack,
const char *needle)
_GL_ARG_NONNULL ((1, 2)));
_GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
# else
-_GL_CXXALIAS_SYS (strstr, char *, (const char *haystack, const char *needle));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * strstr (const char *, const char *); }
+ extern "C++" { char * strstr (char *, const char *); } */
+_GL_CXXALIAS_SYS_CAST2 (strstr,
+ char *, (const char *haystack, const char *needle),
+ const char *, (const char *haystack, const char
*needle));
# endif
_GL_CXXALIASWARN (strstr);
#elif defined GNULIB_POSIXCHECK
@@ -476,8 +482,12 @@ _GL_FUNCDECL_SYS (strcasestr, char *,
(const char *haystack, const char *needle)
__attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
# endif
-_GL_CXXALIAS_SYS (strcasestr, char *,
- (const char *haystack, const char *needle));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * strcasestr (const char *, const char *); }
+ extern "C++" { char * strcasestr (char *, const char *); } */
+_GL_CXXALIAS_SYS_CAST2 (strcasestr,
+ char *, (const char *haystack, const char *needle),
+ const char *, (const char *haystack, const char
*needle));
# endif
_GL_CXXALIASWARN (strcasestr);
#elif defined GNULIB_POSIXCHECK
diff --git a/lib/gl/string.in.h b/lib/gl/string.in.h
index 87e59a5..c44bbce 100644
--- a/lib/gl/string.in.h
+++ b/lib/gl/string.in.h
@@ -66,19 +66,12 @@ _GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int
__c, size_t __n)
_GL_ARG_NONNULL ((1)));
_GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
# else
-# if defined __SUNPRO_CC
- /* This compiler defines an overloaded function
+ /* On some systems, this function is defined as an overloaded function:
extern "C" { const void * std::memchr (const void *, int, size_t); }
- extern "C++" { inline void * std::memchr (void *, int, size_t); }
- and diagnoses an error
- "Error: Could not find a match for std::memchr(const void*, int,
unsigned)"
- */
+ extern "C++" { void * std::memchr (void *, int, size_t); } */
_GL_CXXALIAS_SYS_CAST2 (memchr,
void *, (void const *__s, int __c, size_t __n),
void const *, (void const *__s, int __c, size_t __n));
-# else
-_GL_CXXALIAS_SYS (memchr, void *, (void const *__s, int __c, size_t __n));
-# endif
# endif
_GL_CXXALIASWARN (memchr);
#elif defined GNULIB_POSIXCHECK
@@ -150,7 +143,12 @@ _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int,
size_t)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (memrchr, void *, (void const *, int, size_t));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const void * std::memrchr (const void *, int, size_t); }
+ extern "C++" { void * std::memrchr (void *, int, size_t); } */
+_GL_CXXALIAS_SYS_CAST2 (memrchr,
+ void *, (void const *, int, size_t),
+ void const *, (void const *, int, size_t));
_GL_CXXALIASWARN (memrchr);
#elif defined GNULIB_POSIXCHECK
# undef memrchr
@@ -169,7 +167,12 @@ _GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int
__c_in)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (rawmemchr, void *, (void const *__s, int __c_in));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const void * std::rawmemchr (const void *, int); }
+ extern "C++" { void * std::rawmemchr (void *, int); } */
+_GL_CXXALIAS_SYS_CAST2 (rawmemchr,
+ void *, (void const *__s, int __c_in),
+ void const *, (void const *__s, int __c_in));
_GL_CXXALIASWARN (rawmemchr);
#elif defined GNULIB_POSIXCHECK
# undef rawmemchr
@@ -242,7 +245,12 @@ _GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int
__c_in)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1)));
# endif
-_GL_CXXALIAS_SYS (strchrnul, char *, (char const *__s, int __c_in));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * std::strchrnul (const char *, int); }
+ extern "C++" { char * std::strchrnul (char *, int); } */
+_GL_CXXALIAS_SYS_CAST2 (strchrnul,
+ char *, (char const *__s, int __c_in),
+ char const *, (char const *__s, int __c_in));
_GL_CXXALIASWARN (strchrnul);
#elif defined GNULIB_POSIXCHECK
# undef strchrnul
@@ -340,19 +348,12 @@ _GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char
const *__accept)
__attribute__ ((__pure__))
_GL_ARG_NONNULL ((1, 2)));
# endif
-# if defined __SUNPRO_CC
- /* This compiler defines an overloaded function
+ /* On some systems, this function is defined as an overloaded function:
extern "C" { const char * strpbrk (const char *, const char *); }
- extern "C++" { inline char * strpbrk (char *, const char *); }
- and diagnoses an error
- "Error: Could not find a match for std::strpbrk(const char*, const char*)"
- */
+ extern "C++" { char * strpbrk (char *, const char *); } */
_GL_CXXALIAS_SYS_CAST2 (strpbrk,
char *, (char const *__s, char const *__accept),
const char *, (char const *__s, char const *__accept));
-# else
-_GL_CXXALIAS_SYS (strpbrk, char *, (char const *__s, char const *__accept));
-# endif
_GL_CXXALIASWARN (strpbrk);
# if defined GNULIB_POSIXCHECK
/* strpbrk() assumes the second argument is a list of single-byte characters.
@@ -441,7 +442,12 @@ _GL_FUNCDECL_RPL (strstr, char *, (const char *haystack,
const char *needle)
_GL_ARG_NONNULL ((1, 2)));
_GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
# else
-_GL_CXXALIAS_SYS (strstr, char *, (const char *haystack, const char *needle));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * strstr (const char *, const char *); }
+ extern "C++" { char * strstr (char *, const char *); } */
+_GL_CXXALIAS_SYS_CAST2 (strstr,
+ char *, (const char *haystack, const char *needle),
+ const char *, (const char *haystack, const char
*needle));
# endif
_GL_CXXALIASWARN (strstr);
#elif defined GNULIB_POSIXCHECK
@@ -476,8 +482,12 @@ _GL_FUNCDECL_SYS (strcasestr, char *,
(const char *haystack, const char *needle)
__attribute__ ((__pure__)) _GL_ARG_NONNULL ((1, 2)));
# endif
-_GL_CXXALIAS_SYS (strcasestr, char *,
- (const char *haystack, const char *needle));
+ /* On some systems, this function is defined as an overloaded function:
+ extern "C++" { const char * strcasestr (const char *, const char *); }
+ extern "C++" { char * strcasestr (char *, const char *); } */
+_GL_CXXALIAS_SYS_CAST2 (strcasestr,
+ char *, (const char *haystack, const char *needle),
+ const char *, (const char *haystack, const char
*needle));
# endif
_GL_CXXALIASWARN (strcasestr);
#elif defined GNULIB_POSIXCHECK
hooks/post-receive
--
GNU libidn
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU libidn branch, master, updated. libidn-1-18-11-gf452932,
Simon Josefsson <=