[gimp/meson: 289/291] Fix merge



commit 0238af5ba448b84a5651121cc9538f47d1424a23
Author: Salamandar <felix piedallu me>
Date:   Thu Mar 29 12:01:11 2018 +0200

    Fix merge

 libgimpbase/gimputils.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/libgimpbase/gimputils.c b/libgimpbase/gimputils.c
index 24e4863..d6a6020 100644
--- a/libgimpbase/gimputils.c
+++ b/libgimpbase/gimputils.c
@@ -40,7 +40,14 @@
 #if defined(G_OS_WIN32)
 # include <windows.h>
 # include <shlobj.h>
-#endif
+#else /* G_OS_WIN32 */
+  /* For waitpid() */
+# include <sys/wait.h>
+# include <unistd.h>
+# include <errno.h>
+# ifdef HAVE_SYS_PRCTL_H
+#   include <sys/prctl.h>
+# endif
 #endif /* G_OS_WIN32 */
 
 #include "gimpbasetypes.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]