summaryrefslogtreecommitdiff
path: root/gl/stdio.in.h
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-16 14:50:17 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-16 14:51:50 +0100
commit551d63d20cf7cc9b1e9aa7d6d452857c4310350a (patch)
tree3b24b46ccb2acc096c00e6be34f5b927580a299e /gl/stdio.in.h
parenta92aa9cba43d787ca2670cbcb3ea5d8440f3bb5d (diff)
downloadlibtasn1-551d63d20cf7cc9b1e9aa7d6d452857c4310350a.tar.gz
updated gnulib
Diffstat (limited to 'gl/stdio.in.h')
-rw-r--r--gl/stdio.in.h22
1 files changed, 21 insertions, 1 deletions
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
index 9b31365..d706377 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -1,6 +1,6 @@
/* A GNU-like <stdio.h>.
- Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007-2017 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -118,6 +118,26 @@
# include <unistd.h>
#endif
+/* MSVC declares 'perror' in <stdlib.h>, not in <stdio.h>. We must include
+ it before we #define perror rpl_perror. */
+/* But in any case avoid namespace pollution on glibc systems. */
+#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \
+ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+ && ! defined __GLIBC__
+# include <stdlib.h>
+#endif
+
+/* MSVC declares 'remove' in <io.h>, not in <stdio.h>. We must include
+ it before we #define remove rpl_remove. */
+/* MSVC declares 'rename' in <io.h>, not in <stdio.h>. We must include
+ it before we #define rename rpl_rename. */
+/* But in any case avoid namespace pollution on glibc systems. */
+#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \
+ && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \
+ && ! defined __GLIBC__
+# include <io.h>
+#endif
+
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */