From kde-commits Tue Apr 30 21:30:52 2013 From: Johannes Zarl Date: Tue, 30 Apr 2013 21:30:52 +0000 To: kde-commits Subject: [kphotoalbum] Utilities: Fix compile issue in OS/X. Message-Id: <20130430213052.A222EA6046 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=136735745917354 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 . */ = +// 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 =20