aboutsummaryrefslogtreecommitdiff
path: root/lib/Support/Unix
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2012-08-10 10:56:09 +0000
committerJoerg Sonnenberger <joerg@bec.de>2012-08-10 10:56:09 +0000
commitc103ede50b9a365aff93878508dee6b0e6c1cb94 (patch)
tree4dfcd8b58ec39c97e65cbd8bc6b2ac1e274c8b8c /lib/Support/Unix
parent78cab947cf8f81fc3cadbedd90c20fbe6e5eb1ee (diff)
stdcxx's cstdio doesn't include stdio.h, but the code using PathV2.inc
includes both. Deal with feof and ferror potentially being macros. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161658 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/Unix')
-rw-r--r--lib/Support/Unix/PathV2.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/PathV2.inc
index 4e431ca377..99f8cd4cc3 100644
--- a/lib/Support/Unix/PathV2.inc
+++ b/lib/Support/Unix/PathV2.inc
@@ -50,6 +50,12 @@
#include <limits.h>
#endif
+// Both stdio.h and cstdio are included via different pathes and
+// stdcxx's cstdio doesn't include stdio.h, so it doesn't #undef the macros
+// either.
+#undef ferror
+#undef feof
+
// For GNU Hurd
#if defined(__GNU__) && !defined(PATH_MAX)
# define PATH_MAX 4096