From c0697304c9e42186a93c04e75c7f02b0fcf2db38 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@bec.de>
Date: Fri, 10 Aug 2012 10:56:09 +0000
Subject: stdcxx's cstdio doesn't include stdio.h, but the code using
 PathV2.inc includes both. Deal with feof and ferror potentially being macros.

llvm-svn: 161658
---
 llvm/lib/Support/Unix/PathV2.inc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'llvm/lib/Support/Unix')

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