mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
glib: Remove remaining references to __int64
This is a follow-up to7e821441c4
ande154e3325e
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:
parent
ee2b3c5e97
commit
eeadd57a14
@ -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
|
||||||
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user