Mercurial > mxe-octave
comparison src/mingw-pkg-config-1-gnu-printf.patch @ 5761:c366dab2350c
mingw-w64: update to v8.0.2
* dist-files: add ref to libgomp-1-fixes.patch, mingw-pkg-config-1-gnu-printf.patch
* src/libgomp-1-fixes.patch, src/mingw-pkg-config-1-gnu-printf.patch: new files for mingw-w64 update
* src/mingw-w64-1-float-h.patch: update patch
* src/mingw-w64.mk: update version, checksum
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 26 May 2021 08:18:17 -0400 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
5760:baeb0900fdf7 | 5761:c366dab2350c |
---|---|
1 diff -Naur a/glib/configure.ac b/glib/configure.ac | |
2 --- a/glib/configure.ac 2015-09-21 15:38:33.000000000 +0300 | |
3 +++ b/glib/configure.ac 2015-09-22 09:09:02.118820700 +0300 | |
4 @@ -567,7 +567,7 @@ | |
5 ]) | |
6 fi | |
7 | |
8 -AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], [ | |
9 +AS_IF([test x$ac_cv_sizeof_long_long = x8], [ | |
10 # long long is a 64 bit integer. | |
11 AC_MSG_CHECKING(for format to printf and scanf a guint64) | |
12 AC_CACHE_VAL(glib_cv_long_long_format,[ | |
13 @@ -589,8 +589,8 @@ | |
14 AS_IF([ test -n "$glib_cv_long_long_format"], [ | |
15 AC_MSG_RESULT(%${glib_cv_long_long_format}u) | |
16 AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long]) | |
17 - if test x"$glib_cv_long_long_format" = xI64; then | |
18 - AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64]) | |
19 + if test x"$glib_cv_long_long_format" = xll; then | |
20 + AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format ll]) | |
21 fi | |
22 ], [AC_MSG_RESULT(none)]) | |
23 ],[ test x$ac_cv_sizeof___int64 = x8], [ | |
24 @@ -3177,8 +3177,8 @@ | |
25 glib_msize_type='LONG' | |
26 ;; | |
27 "long long"|__int64) | |
28 - gsize_modifier='"I64"' | |
29 - gsize_format='"I64u"' | |
30 + gsize_modifier='"z"' | |
31 + gsize_format='"zu"' | |
32 glib_msize_type='INT64' | |
33 ;; | |
34 esac | |
35 @@ -3200,8 +3200,8 @@ | |
36 glib_mssize_type='LONG' | |
37 ;; | |
38 "long long"|__int64) | |
39 - gssize_modifier='"I64"' | |
40 - gssize_format='"I64i"' | |
41 + gssize_modifier='"z"' | |
42 + gssize_format='"zi"' | |
43 glib_mssize_type='INT64' | |
44 ;; | |
45 esac | |
46 @@ -3230,9 +3230,9 @@ | |
47 ;; | |
48 $ac_cv_sizeof_long_long) | |
49 glib_intptr_type_define='long long' | |
50 - gintptr_modifier='"I64"' | |
51 - gintptr_format='"I64i"' | |
52 - guintptr_format='"I64u"' | |
53 + gintptr_modifier='"ll"' | |
54 + gintptr_format='"lli"' | |
55 + guintptr_format='"llu"' | |
56 glib_gpi_cast='(gint64)' | |
57 glib_gpui_cast='(guint64)' | |
58 ;; | |
59 diff -Naur a/glib/glib/gmacros.h b/glib/glib/gmacros.h | |
60 --- a/glib/glib/gmacros.h 2015-08-19 06:35:30.000000000 +0300 | |
61 +++ b/glib/glib/gmacros.h 2015-09-22 09:09:02.118820700 +0300 | |
62 @@ -79,9 +79,9 @@ | |
63 | |
64 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | |
65 #define G_GNUC_PRINTF( format_idx, arg_idx ) \ | |
66 - __attribute__((__format__ (__printf__, format_idx, arg_idx))) | |
67 + __attribute__((__format__ (gnu_printf, format_idx, arg_idx))) | |
68 #define G_GNUC_SCANF( format_idx, arg_idx ) \ | |
69 - __attribute__((__format__ (__scanf__, format_idx, arg_idx))) | |
70 + __attribute__((__format__ (gnu_scanf, format_idx, arg_idx))) | |
71 #define G_GNUC_FORMAT( arg_idx ) \ | |
72 __attribute__((__format_arg__ (arg_idx))) | |
73 #define G_GNUC_NORETURN \ | |
74 diff -Naur a/glib/glib/gpoll.h b/glib/glib/gpoll.h | |
75 --- a/glib/glib/gpoll.h 2014-12-20 00:49:48.000000000 +0300 | |
76 +++ b/glib/glib/gpoll.h 2015-09-22 09:09:02.118820700 +0300 | |
77 @@ -108,7 +108,7 @@ | |
78 */ | |
79 #ifdef G_OS_WIN32 | |
80 #if GLIB_SIZEOF_VOID_P == 8 | |
81 -#define G_POLLFD_FORMAT "%#I64x" | |
82 +#define G_POLLFD_FORMAT "%#llx" | |
83 #else | |
84 #define G_POLLFD_FORMAT "%#x" | |
85 #endif | |
86 |