diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-27 17:46:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-27 17:55:06 -0700 |
| commit | 6c52e9b93b68795d1876718d8f3c1d57bf7f6d91 (patch) | |
| tree | b2d93b1121c05cfffa59df9325139cdf56eed6c0 /lib/inttypes.in.h | |
| parent | cc41938ae0f5694d657f360f19dd9ac166271db2 (diff) | |
| download | emacs-6c52e9b93b68795d1876718d8f3c1d57bf7f6d91.tar.gz emacs-6c52e9b93b68795d1876718d8f3c1d57bf7f6d91.tar.bz2 emacs-6c52e9b93b68795d1876718d8f3c1d57bf7f6d91.zip | |
Merge from gnulib
This incorporates:
2015-05-27 qacl: Reimplement qset_acl and qcopy_acl (Bug#20666)
2015-05-27 file-has-acl: Split feature tests again (Bug#20667)
2015-05-27 string: fix build failure on BSD/OSX with FORTIFY_SOURCE
2015-05-26 stdio: limit __gnu_printf__ witness to gcc 4.4+
2015-05-26 inttypes: force correct mingw PRIdMAX even without <stdio.h>
2015-05-26 stdio: fix probe on mingw under gcc 5.1
* admin/merge-gnulib (GNULIB_MODULES):
Replace qacl with qcopy-acl, since we don't need the rest of qacl.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/inttypes.in.h, lib/qcopy-acl.c, lib/qset-acl.c:
* lib/string.in.h, m4/acl.m4, m4/stdio_h.m4:
Get latest versions from gnulib.
* lib/get-permissions.c, lib/set-permissions.c: New files.
* lib/gnulib.mk, m4/gnulib-comp.m4:
Regenerate.
* nt/gnulib.mk: Merge lib/gnulib.mk changes by hand.
Diffstat (limited to 'lib/inttypes.in.h')
| -rw-r--r-- | lib/inttypes.in.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 13a72bee90c..78846f69683 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -51,6 +51,10 @@ #endif /* Get CHAR_BIT. */ #include <limits.h> +/* On mingw, __USE_MINGW_ANSI_STDIO only works if <stdio.h> is also included */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include <stdio.h> +#endif #if !(INT_MIN == INT32_MIN && INT_MAX == INT32_MAX) # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>." |