luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-14 14:27:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove G_HAVE_GINT64 conditionalization.

Browse Source 
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
This commit is contained in:
Joshua N Pritikin 2001-10-11 03:06:49 +00:00
parent 04e753ab88
commit dbf99df7e3
10 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Wed Oct 10 20:07:36 2001 Joshua N Pritikin <vishnu@pobox.com>
* glib/gmessages.c glib/gtypes.h: Remove G_HAVE_GINT64
conditionalization.
Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com> Wed Oct 10 17:34:15 2001 Joshua N Pritikin <vishnu@pobox.com>
* configure.in: Un-conditionalize and require a 64-bit integer * configure.in: Un-conditionalize and require a 64-bit integer

4
glib/gmessages.c
View File

@ -1048,11 +1048,7 @@ printf_string_upper_bound (const gchar *format,
conv_len *= 2; conv_len *= 2;
if (spec.mod_extra_long) if (spec.mod_extra_long)
{ {
#ifdef G_HAVE_GINT64
(void) va_arg (args, gint64); (void) va_arg (args, gint64);
#else /* !G_HAVE_GINT64 */
(void) va_arg (args, long);
#endif /* !G_HAVE_GINT64 */
} }
else if (spec.mod_long) else if (spec.mod_long)
(void) va_arg (args, long); (void) va_arg (args, long);

16
glib/gtypes.h
View File

@ -160,8 +160,7 @@ typedef void (*GFreeFunc) (gpointer data);
# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
#endif /* __i386__ */ #endif /* __i386__ */
#ifdef G_HAVE_GINT64 #define GUINT64_SWAP_LE_BE_CONSTANT(val) ((guint64) ( \
# define GUINT64_SWAP_LE_BE_CONSTANT(val) ((guint64) ( \
(((guint64) (val) & \ (((guint64) (val) & \
(guint64) G_GINT64_CONSTANT(0x00000000000000ffU)) << 56) | \ (guint64) G_GINT64_CONSTANT(0x00000000000000ffU)) << 56) | \
(((guint64) (val) & \ (((guint64) (val) & \
@ -178,8 +177,8 @@ typedef void (*GFreeFunc) (gpointer data);
(guint64) G_GINT64_CONSTANT(0x00ff000000000000U)) >> 40) | \ (guint64) G_GINT64_CONSTANT(0x00ff000000000000U)) >> 40) | \
(((guint64) (val) & \ (((guint64) (val) & \
(guint64) G_GINT64_CONSTANT(0xff00000000000000U)) >> 56))) (guint64) G_GINT64_CONSTANT(0xff00000000000000U)) >> 56)))
# if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 #if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
# define GUINT64_SWAP_LE_BE_X86(val) \ # define GUINT64_SWAP_LE_BE_X86(val) \
(__extension__ \ (__extension__ \
({ union { guint64 __ll; \ ({ union { guint64 __ll; \
guint32 __l[2]; } __r; \ guint32 __l[2]; } __r; \
@ -194,10 +193,9 @@ typedef void (*GFreeFunc) (gpointer data);
__r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]); \ __r.__l[1] = GUINT32_SWAP_LE_BE (__w.__l[0]); \
} \ } \
__r.__ll; })) __r.__ll; }))
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86 (val)) # define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86 (val))
# else /* !__i386__ */ #else /* !__i386__ */
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT(val)) # define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT(val))
# endif
#endif #endif
#define GUINT16_SWAP_LE_PDP(val) ((guint16) (val)) #define GUINT16_SWAP_LE_PDP(val) ((guint16) (val))
@ -221,12 +219,10 @@ typedef void (*GFreeFunc) (gpointer data);
#define GINT32_FROM_BE(val) (GINT32_TO_BE (val)) #define GINT32_FROM_BE(val) (GINT32_TO_BE (val))
#define GUINT32_FROM_BE(val) (GUINT32_TO_BE (val)) #define GUINT32_FROM_BE(val) (GUINT32_TO_BE (val))
#ifdef G_HAVE_GINT64
#define GINT64_FROM_LE(val) (GINT64_TO_LE (val)) #define GINT64_FROM_LE(val) (GINT64_TO_LE (val))
#define GUINT64_FROM_LE(val) (GUINT64_TO_LE (val)) #define GUINT64_FROM_LE(val) (GUINT64_TO_LE (val))
#define GINT64_FROM_BE(val) (GINT64_TO_BE (val)) #define GINT64_FROM_BE(val) (GINT64_TO_BE (val))
#define GUINT64_FROM_BE(val) (GUINT64_TO_BE (val)) #define GUINT64_FROM_BE(val) (GUINT64_TO_BE (val))
#endif
#define GLONG_FROM_LE(val) (GLONG_TO_LE (val)) #define GLONG_FROM_LE(val) (GLONG_TO_LE (val))
#define GULONG_FROM_LE(val) (GULONG_TO_LE (val)) #define GULONG_FROM_LE(val) (GULONG_TO_LE (val))