[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum] Utilities: Fix compile issue in OS/X.
From:       Johannes Zarl <isilmendil () isilme ! lupus ! uberspace ! de>
Date:       2013-04-30 21:30:52
Message-ID: 20130430213052.A222EA6046 () git ! kde ! org
[Download RAW message or body]

Git commit 79782e9a80591ca9e052df089351e412f7e9c451 by Johannes Zarl.
Committed on 13/02/2013 at 23:37.
Pushed by johanneszarl into branch 'master'.

Fix compile issue in OS/X.

BUG: 313987

M  +8    -0    Utilities/Process.cpp

http://commits.kde.org/kphotoalbum/79782e9a80591ca9e052df089351e412f7e9c451

diff --git a/Utilities/Process.cpp b/Utilities/Process.cpp
index f3e2ba6..cbbb245 100644
--- a/Utilities/Process.cpp
+++ b/Utilities/Process.cpp
@@ -17,6 +17,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+// OS/X defines stdout and stderr as macros, which interfere with our code here:
+#if defined(stdout)
+#undef stdout
+#endif
+#if defined(stderr)
+#undef stderr
+#endif
+
 #include "Process.h"
 #include <KDebug>
 
[prev in list] [next in list] [prev in thread] [next in thread]