From: Joerg Sonnenberger <joerg@bec.de>
Date: Fri, 10 Aug 2012 10:56:09 +0000 (+0000)
Subject: stdcxx's cstdio doesn't include stdio.h, but the code using PathV2.inc
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c103ede50b9a365aff93878508dee6b0e6c1cb94;p=oota-llvm.git

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
---

diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/PathV2.inc
index 4e431ca3775..99f8cd4cc37 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