mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Fix compilation of scm_nl_langinfo when some nl_langinfo items are missing.

Browse source 
* i18n.c (scm_nl_langinfo): Don't assume that both INT_* and
  the corresponding non-INT_* items are always either all defined
  or all undefined.
This commit is contained in:
Eli Zaretskii 2014-06-22 19:11:30 +03:00
parent f089330846
commit c7161ee334
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libguile/i18n.c
View file

@ -1580,9 +1580,13 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
} }
#endif #endif
#if (defined FRAC_DIGITS) && (defined INT_FRAC_DIGITS) #if defined FRAC_DIGITS || defined INT_FRAC_DIGITS
#ifdef FRAC_DIGITS
case FRAC_DIGITS: case FRAC_DIGITS:
#endif
#ifdef INT_FRAC_DIGITS
case INT_FRAC_DIGITS: case INT_FRAC_DIGITS:
#endif
/* This is to be interpreted as a single integer. */ /* This is to be interpreted as a single integer. */
if (*c_result == CHAR_MAX) if (*c_result == CHAR_MAX)
/* Unspecified. */ /* Unspecified. */
@ -1594,12 +1598,18 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
break; break;
#endif #endif
#if (defined P_CS_PRECEDES) && (defined INT_N_CS_PRECEDES) #if defined P_CS_PRECEDES || defined N_CS_PRECEDES || \
defined INT_P_CS_PRECEDES || defined INT_N_CS_PRECEDES || \
defined P_SEP_BY_SPACE || defined N_SEP_BY_SPACE
#ifdef P_CS_PRECEDES
case P_CS_PRECEDES: case P_CS_PRECEDES:
case N_CS_PRECEDES: case N_CS_PRECEDES:
#endif
#ifdef INT_N_CS_PRECEDES
case INT_P_CS_PRECEDES: case INT_P_CS_PRECEDES:
case INT_N_CS_PRECEDES: case INT_N_CS_PRECEDES:
#if (defined P_SEP_BY_SPACE) && (defined N_SEP_BY_SPACE) #endif
#ifdef P_SEP_BY_SPACE
case P_SEP_BY_SPACE: case P_SEP_BY_SPACE:
case N_SEP_BY_SPACE: case N_SEP_BY_SPACE:
#endif #endif
@ -1610,11 +1620,16 @@ SCM_DEFINE (scm_nl_langinfo, "nl-langinfo", 1, 1, 0,
break; break;
#endif #endif
#if (defined P_SIGN_POSN) && (defined INT_N_SIGN_POSN) #if defined P_SIGN_POSN || defined N_SIGN_POSN || \
defined INT_P_SIGN_POSN || defined INT_N_SIGN_POSN
#ifdef P_SIGN_POSN
case P_SIGN_POSN: case P_SIGN_POSN:
case N_SIGN_POSN: case N_SIGN_POSN:
#endif
#ifdef INT_P_SIGN_POSN
case INT_P_SIGN_POSN: case INT_P_SIGN_POSN:
case INT_N_SIGN_POSN: case INT_N_SIGN_POSN:
#endif
/* See `(libc) Sign of Money Amount' for the interpretation of the /* See `(libc) Sign of Money Amount' for the interpretation of the
return value here. */ return value here. */
switch (*c_result) switch (*c_result)