From f800121ed8d3f730a06ef58d84e3685dd5411c6a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Mar 2006 23:45:30 +0000 Subject: [PATCH] Add G_GUINT64_CONSTANT. 2006-03-08 Tor Lillqvist * glibconfig.h.win32.in: Add G_GUINT64_CONSTANT. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ glibconfig.h.win32.in | 5 +++++ 4 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index f84f430..c6b8456 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-03-08 Tor Lillqvist + + * glibconfig.h.win32.in: Add G_GUINT64_CONSTANT. + 2006-03-07 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f84f430..c6b8456 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2006-03-08 Tor Lillqvist + + * glibconfig.h.win32.in: Add G_GUINT64_CONSTANT. + 2006-03-07 Matthias Clasen * configure.in: Bump version diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f84f430..c6b8456 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2006-03-08 Tor Lillqvist + + * glibconfig.h.win32.in: Add G_GUINT64_CONSTANT. + 2006-03-07 Matthias Clasen * configure.in: Bump version diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 9e71ea7..315249a 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -55,6 +55,11 @@ typedef unsigned __int64 guint64; #else /* _MSC_VER */ #define G_GINT64_CONSTANT(val) (val##i64) #endif /* _MSC_VER */ +#ifndef _MSC_VER +#define G_GUINT64_CONSTANT(val) (G_GNUC_EXTENSION (val##ULL)) +#else /* _MSC_VER */ +#define G_GUINT64_CONSTANT(val) (val##Ui64) +#endif /* _MSC_VER */ #define G_GINT64_MODIFIER "I64" #define G_GINT64_FORMAT "I64i" #define G_GUINT64_FORMAT "I64u" -- 2.7.4