mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 12:20:26 +02:00
Code Activity

Temporarily fix unistr.in.h' to allow compilation with -Wundef'.

Browse source 
See <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24225> for details.

* lib/unistr.in.h: Change #if's into #ifdef's.
This commit is contained in:
Ludovic Courtès 2010-12-07 22:49:46 +01:00
parent 49114fd43d
commit 066a37a13e
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/unistr.in.h
View file

@ -134,7 +134,7 @@ extern int
/* The variants with _safe suffix are safe, even if the library is compiled /* The variants with _safe suffix are safe, even if the library is compiled
without --enable-safety. */ without --enable-safety. */
#if GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U8_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n); u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n);
@ -157,7 +157,7 @@ u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U16_MBTOUC_UNSAFE || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U16_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n); u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
@ -180,7 +180,7 @@ u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U32_MBTOUC_UNSAFE || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U32_MBTOUC_UNSAFE || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n); u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
@ -191,11 +191,11 @@ u32_mbtouc_unsafe (ucs4_t *puc,
{ {
uint32_t c = *s; uint32_t c = *s;
# if CONFIG_UNICODE_SAFETY # ifdef CONFIG_UNICODE_SAFETY
if (c < 0xd800 || (c >= 0xe000 && c < 0x110000)) if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
# endif # endif
*puc = c; *puc = c;
# if CONFIG_UNICODE_SAFETY # ifdef CONFIG_UNICODE_SAFETY
else else
/* invalid multibyte character */ /* invalid multibyte character */
*puc = 0xfffd; *puc = 0xfffd;
@ -205,7 +205,7 @@ u32_mbtouc_unsafe (ucs4_t *puc,
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U8_MBTOUC || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U8_MBTOUC || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n); u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
@ -228,7 +228,7 @@ u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U16_MBTOUC || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U16_MBTOUC || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n); u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
@ -251,7 +251,7 @@ u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U32_MBTOUC || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U32_MBTOUC || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n); u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
@ -279,17 +279,17 @@ u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n _GL_UNUSED_PARAMETER)
/* Similar to u*_mbtouc(), except that the return value gives more details /* Similar to u*_mbtouc(), except that the return value gives more details
about the failure, similar to mbrtowc(). */ about the failure, similar to mbrtowc(). */
#if GNULIB_UNISTR_U8_MBTOUCR || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U8_MBTOUCR || HAVE_LIBUNISTRING
extern int extern int
u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n); u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n);
#endif #endif
#if GNULIB_UNISTR_U16_MBTOUCR || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U16_MBTOUCR || HAVE_LIBUNISTRING
extern int extern int
u16_mbtoucr (ucs4_t *puc, const uint16_t *s, size_t n); u16_mbtoucr (ucs4_t *puc, const uint16_t *s, size_t n);
#endif #endif
#if GNULIB_UNISTR_U32_MBTOUCR || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U32_MBTOUCR || HAVE_LIBUNISTRING
extern int extern int
u32_mbtoucr (ucs4_t *puc, const uint32_t *s, size_t n); u32_mbtoucr (ucs4_t *puc, const uint32_t *s, size_t n);
#endif #endif
@ -300,7 +300,7 @@ extern int
/* Similar to wctomb(), except that s must not be NULL, and the argument n /* Similar to wctomb(), except that s must not be NULL, and the argument n
must be specified. */ must be specified. */
#if GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U8_UCTOMB || HAVE_LIBUNISTRING
/* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr. */ /* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr. */
extern int extern int
u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n); u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
@ -322,7 +322,7 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U16_UCTOMB || HAVE_LIBUNISTRING
/* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr. */ /* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr. */
extern int extern int
u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n); u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
@ -344,7 +344,7 @@ u16_uctomb (uint16_t *s, ucs4_t uc, int n)
# endif # endif
#endif #endif
#if GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING #if defined GNULIB_UNISTR_U32_UCTOMB || HAVE_LIBUNISTRING
# if !HAVE_INLINE # if !HAVE_INLINE
extern int extern int
u32_uctomb (uint32_t *s, ucs4_t uc, int n); u32_uctomb (uint32_t *s, ucs4_t uc, int n);