luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-08 18:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

autotools: use C99 printf format specifiers on Windows. Fixes #1497

Browse Source 
Since we now require a C99 compatible printf and use gnulib on Windows,
we also mark our printf functions as gnu_printf. GCC complains about the
Windows specific I64 specifiers we still write to glibconfig.h with the
autotools build.

To fix this switch all I64(x) to ll(x).

This also makes the glibconfig.h output for those macros match the ones
we get when using meson.
This commit is contained in:
Christoph Reiter 2018-08-24 21:46:47 +02:00
parent 7e821441c4
commit 3d7cde654c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -142,7 +142,7 @@ case "$host" in
case "$host" in case "$host" in
x86_64-*-*) x86_64-*-*)
LIB_EXE_MACHINE_FLAG=X64 LIB_EXE_MACHINE_FLAG=X64
glib_pollfd_format='%#I64x' glib_pollfd_format='%#llx'
;; ;;
esac esac
@ -514,7 +514,7 @@ AS_IF([test x$ac_cv_sizeof_long_long = x8], [
# long long is a 64 bit integer. # long long is a 64 bit integer.
AC_MSG_CHECKING(for format to printf and scanf a guint64) AC_MSG_CHECKING(for format to printf and scanf a guint64)
AC_CACHE_VAL(glib_cv_long_long_format,[ AC_CACHE_VAL(glib_cv_long_long_format,[
for format in ll q I64; do for format in ll q; do
AC_TRY_RUN([#include <stdio.h> AC_TRY_RUN([#include <stdio.h>
int main() int main()
{ {
@ -3096,8 +3096,8 @@ long)
glib_msize_type='LONG' glib_msize_type='LONG'
;; ;;
"long long") "long long")
gsize_modifier='"I64"' gsize_modifier='"ll"'
gsize_format='"I64u"' gsize_format='"llu"'
glib_msize_type='INT64' glib_msize_type='INT64'
;; ;;
esac esac
@ -3119,8 +3119,8 @@ long)
glib_mssize_type='LONG' glib_mssize_type='LONG'
;; ;;
"long long") "long long")
gssize_modifier='"I64"' gssize_modifier='"ll"'
gssize_format='"I64i"' gssize_format='"lli"'
glib_mssize_type='INT64' glib_mssize_type='INT64'
;; ;;
esac esac
@ -3149,9 +3149,9 @@ $ac_cv_sizeof_long)
;; ;;
$ac_cv_sizeof_long_long) $ac_cv_sizeof_long_long)
glib_intptr_type_define='long long' glib_intptr_type_define='long long'
gintptr_modifier='"I64"' gintptr_modifier='"ll"'
gintptr_format='"I64i"' gintptr_format='"lli"'
guintptr_format='"I64u"' guintptr_format='"llu"'
glib_gpi_cast='(gint64)' glib_gpi_cast='(gint64)'
glib_gpui_cast='(guint64)' glib_gpui_cast='(guint64)'
;; ;;