luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-25 16:46:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnulib: forgot some changes from HAVE_LONG_LONG_INT to HAVE_LONG_LONG

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=756382
This commit is contained in:
Ignacio Casal Quinteiro 2015-10-15 17:36:33 +02:00
parent 212e4232e7
commit 0b84596f6e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gnulib/printf-parse.c
View File

@ -448,7 +448,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
switch (c) switch (c)
{ {
case 'd': case 'i': case 'd': case 'i':
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
/* If 'long long' exists and is larger than 'long': */ /* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4)) if (flags >= 16 || (flags & 4))
type = TYPE_LONGLONGINT; type = TYPE_LONGLONGINT;
@ -466,7 +466,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_INT; type = TYPE_INT;
break; break;
case 'o': case 'u': case 'x': case 'X': case 'o': case 'u': case 'x': case 'X':
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
/* If 'long long' exists and is larger than 'long': */ /* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4)) if (flags >= 16 || (flags & 4))
type = TYPE_ULONGLONGINT; type = TYPE_ULONGLONGINT;
@ -526,7 +526,7 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_POINTER; type = TYPE_POINTER;
break; break;
case 'n': case 'n':
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
/* If 'long long' exists and is larger than 'long': */ /* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4)) if (flags >= 16 || (flags & 4))
type = TYPE_COUNT_LONGLONGINT_POINTER; type = TYPE_COUNT_LONGLONGINT_POINTER;

12
glib/gnulib/vasnprintf.c
View File

@ -1526,7 +1526,7 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
switch (conversion) switch (conversion)
{ {
case 'd': case 'i': case 'u': case 'd': case 'i': case 'u':
# if HAVE_LONG_LONG_INT # if HAVE_LONG_LONG
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length = tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@ -1556,7 +1556,7 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
break; break;
case 'o': case 'o':
# if HAVE_LONG_LONG_INT # if HAVE_LONG_LONG
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length = tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@ -1584,7 +1584,7 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
break; break;
case 'x': case 'X': case 'x': case 'X':
# if HAVE_LONG_LONG_INT # if HAVE_LONG_LONG
if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT) if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
tmp_length = tmp_length =
(unsigned int) (sizeof (unsigned long long) * CHAR_BIT (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
@ -1912,7 +1912,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
case TYPE_COUNT_LONGINT_POINTER: case TYPE_COUNT_LONGINT_POINTER:
*a.arg[dp->arg_index].a.a_count_longint_pointer = length; *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
break; break;
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
case TYPE_COUNT_LONGLONGINT_POINTER: case TYPE_COUNT_LONGLONGINT_POINTER:
*a.arg[dp->arg_index].a.a_count_longlongint_pointer = length; *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
break; break;
@ -4808,7 +4808,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
switch (type) switch (type)
{ {
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
case TYPE_LONGLONGINT: case TYPE_LONGLONGINT:
case TYPE_ULONGLONGINT: case TYPE_ULONGLONGINT:
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
@ -5017,7 +5017,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
SNPRINTF_BUF (arg); SNPRINTF_BUF (arg);
} }
break; break;
#if HAVE_LONG_LONG_INT #if HAVE_LONG_LONG
case TYPE_LONGLONGINT: case TYPE_LONGLONGINT:
{ {
long long int arg = a.arg[dp->arg_index].a.a_longlongint; long long int arg = a.arg[dp->arg_index].a.a_longlongint;