Set _XOPEN_SOURCE to 600 to avoid conflict with C99.

5 files changed, 65 insertions, 1 deletions

diff --git a/wm/marco/distinfo b/wm/marco/distinfo
index 5617114d051..f4a634b4b25 100644
--- a/wm/marco/distinfo
+++ b/wm/marco/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2017/06/23 17:13:31 youri Exp $
+$NetBSD: distinfo,v 1.4 2017/06/28 15:35:11 jperkin Exp $
 
 SHA1 (marco-1.18.1.tar.xz) = 6c09e95749bd01c46937b99894298f67918f720a
 RMD160 (marco-1.18.1.tar.xz) = 2b2d80a7148963ea8910606e9fa25cb4838e4742
 SHA512 (marco-1.18.1.tar.xz) = d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c
 Size (marco-1.18.1.tar.xz) = 1251108 bytes
 SHA1 (patch-src_compositor_compositor-xrender.c) = 5cb7e98d8e2b1dda2842f422ad2268bb258c35ee
+SHA1 (patch-src_core_delete.c) = ace180e80d63bbf0a35abc18bf6501061e09d158
+SHA1 (patch-src_core_keybindings.c) = 98235897926d017994e1fa01c754419d14432b08
+SHA1 (patch-src_core_main.c) = 2ca845168633a2856a86453407b3a165f66e8863
+SHA1 (patch-src_core_window-props.c) = 23d7c68e3e2c89004c610046378bd855d1d6358a
diff --git a/wm/marco/patches/patch-src_core_delete.c b/wm/marco/patches/patch-src_core_delete.c
new file mode 100644
index 00000000000..e9d64f70030
--- /dev/null
+++ b/wm/marco/patches/patch-src_core_delete.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_delete.c,v 1.1 2017/06/28 15:35:11 jperkin Exp $
+
+Set _XOPEN_SOURCE to 600 to avoid conflict with C99.
+
+--- src/core/delete.c.orig	2017-05-10 15:03:59.000000000 +0000
++++ src/core/delete.c
+@@ -23,7 +23,7 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#define _XOPEN_SOURCE /* for gethostname() and kill() */
++#define _XOPEN_SOURCE 600 /* for gethostname() and kill() */
+ 
+ #include <config.h>
+ #include "util.h"
diff --git a/wm/marco/patches/patch-src_core_keybindings.c b/wm/marco/patches/patch-src_core_keybindings.c
new file mode 100644
index 00000000000..ec4d9e7b8c1
--- /dev/null
+++ b/wm/marco/patches/patch-src_core_keybindings.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_keybindings.c,v 1.1 2017/06/28 15:35:11 jperkin Exp $
+
+Set _XOPEN_SOURCE to 600 to avoid conflict with C99.
+
+--- src/core/keybindings.c.orig	2017-05-10 15:03:59.000000000 +0000
++++ src/core/keybindings.c
+@@ -24,7 +24,7 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#define _XOPEN_SOURCE /* for putenv() */
++#define _XOPEN_SOURCE 600 /* for putenv() */
+ 
+ #include <config.h>
+ #include "keybindings.h"
diff --git a/wm/marco/patches/patch-src_core_main.c b/wm/marco/patches/patch-src_core_main.c
new file mode 100644
index 00000000000..4b1b94c2d11
--- /dev/null
+++ b/wm/marco/patches/patch-src_core_main.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_main.c,v 1.1 2017/06/28 15:35:11 jperkin Exp $
+
+Set _XOPEN_SOURCE to 600 to avoid conflict with C99.
+
+--- src/core/main.c.orig	2017-05-10 15:03:59.000000000 +0000
++++ src/core/main.c
+@@ -42,7 +42,7 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#define _XOPEN_SOURCE /* for putenv() and some signal-related functions */
++#define _XOPEN_SOURCE 600 /* for putenv() and some signal-related functions */
+ 
+ #include <config.h>
+ #include "main.h"
diff --git a/wm/marco/patches/patch-src_core_window-props.c b/wm/marco/patches/patch-src_core_window-props.c
new file mode 100644
index 00000000000..525901cc58b
--- /dev/null
+++ b/wm/marco/patches/patch-src_core_window-props.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_window-props.c,v 1.1 2017/06/28 15:35:11 jperkin Exp $
+
+Set _XOPEN_SOURCE to 600 to avoid conflict with C99.
+
+--- src/core/window-props.c.orig	2017-05-10 15:03:59.000000000 +0000
++++ src/core/window-props.c
+@@ -36,7 +36,7 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#define _XOPEN_SOURCE /* for gethostname() */
++#define _XOPEN_SOURCE 600 /* for gethostname() */
+ 
+ #include <config.h>
+ #include "window-props.h"