From 540fd15e4c25bb66461baf0114a9c57a9d514ad8 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 29 Aug 2018 12:12:05 +0100 Subject: [PATCH] glib: Remove remaining references to __int64 This is a follow-up to 7e821441c482917e54435a07893272d87d3ad9e5 and e154e3325eb7274b8164f8d7a5e0f335646c2bb7 removing some remaining references to __int64 which are no longer necessary. Signed-off-by: Philip Withnall https://gitlab.gnome.org/GNOME/glib/issues/1313 --- README.win32 | 3 +-- glib/gscanner.c | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.win32 b/README.win32 index 1683d54b9..62236d016 100644 --- a/README.win32 +++ b/README.win32 @@ -145,8 +145,7 @@ prebuilt binaries are included in the "dev" packages. Please note that the ./configure mechanism should not blindly be used to build a GLib to be distributed to other developers because it -produces a compiler-dependent glibconfig.h. For instance, the typedef -for gint64 is long long with gcc, but __int64 with MSVC. +produces a compiler-dependent glibconfig.h. Except for this and a few other minor issues, there shouldn't be any reason to distribute separate GLib headers and DLLs for gcc and MSVC6 diff --git a/glib/gscanner.c b/glib/gscanner.c index 389376c59..9acf3dfa2 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -1697,12 +1697,7 @@ g_scanner_get_token_i (GScanner *scanner, *token_p = G_TOKEN_FLOAT; if (scanner->config->store_int64) { -#ifdef _MSC_VER - /* work around error C2520, see gvaluetransform.c */ - value_p->v_float = (__int64)value_p->v_int64; -#else value_p->v_float = value_p->v_int64; -#endif } else value_p->v_float = value_p->v_int;