* libc/strfmon.c (__setup_vars): Fix compiler warning about assigning const
strings. Compare a pointer to NULL rather than '\0'. * dll_init.cc (dll_dllcrt0_1): Minor comment fix. * pipe.cc (fhandler_pipe::create_selectable): Remove Win9x accommodation.
This commit is contained in:
@ -413,12 +413,13 @@ __setup_vars(int flags, char *cs_precedes, char *sep_by_space,
|
||||
char *sign_posn, char **signstr) {
|
||||
|
||||
struct lconv *lc = localeconv();
|
||||
static char negative[] = "-";
|
||||
|
||||
if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) {
|
||||
*cs_precedes = lc->int_n_cs_precedes;
|
||||
*sep_by_space = lc->int_n_sep_by_space;
|
||||
*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
|
||||
*signstr = (lc->negative_sign == '\0') ? "-"
|
||||
*signstr = (lc->negative_sign == NULL) ? negative
|
||||
: lc->negative_sign;
|
||||
} else if (flags & USE_INTL_CURRENCY) {
|
||||
*cs_precedes = lc->int_p_cs_precedes;
|
||||
@ -429,7 +430,7 @@ __setup_vars(int flags, char *cs_precedes, char *sep_by_space,
|
||||
*cs_precedes = lc->n_cs_precedes;
|
||||
*sep_by_space = lc->n_sep_by_space;
|
||||
*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
|
||||
*signstr = (lc->negative_sign == '\0') ? "-"
|
||||
*signstr = (lc->negative_sign == NULL) ? negative
|
||||
: lc->negative_sign;
|
||||
} else {
|
||||
*cs_precedes = lc->p_cs_precedes;
|
||||
|
Reference in New Issue
Block a user