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

glib: Remove remaining references to __int64

Browse Source 
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 <withnall@endlessm.com>

https://gitlab.gnome.org/GNOME/glib/issues/1313
This commit is contained in:
Philip Withnall 2018-08-29 12:12:05 +01:00 committed by Xavier Claessens
parent 7df0977de4
commit 540fd15e4c
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.win32
View File

@ -145,8 +145,7 @@ prebuilt binaries are included in the "dev" packages.
Please note that the ./configure mechanism should not blindly be used Please note that the ./configure mechanism should not blindly be used
to build a GLib to be distributed to other developers because it to build a GLib to be distributed to other developers because it
produces a compiler-dependent glibconfig.h. For instance, the typedef produces a compiler-dependent glibconfig.h.
for gint64 is long long with gcc, but __int64 with MSVC.
Except for this and a few other minor issues, there shouldn't be any 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 reason to distribute separate GLib headers and DLLs for gcc and MSVC6

5
glib/gscanner.c
View File

@ -1697,12 +1697,7 @@ g_scanner_get_token_i (GScanner *scanner,
*token_p = G_TOKEN_FLOAT; *token_p = G_TOKEN_FLOAT;
if (scanner->config->store_int64) 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; value_p->v_float = value_p->v_int64;
#endif
} }
else else
value_p->v_float = value_p->v_int; value_p->v_float = value_p->v_int;