From 460ac864a17b1dd7953c86bcc3ac0ee9acbb079d Mon Sep 17 00:00:00 2001
From: Kris Maglione <jg@suckless.org>
Date: Mon, 16 Jul 2007 21:44:25 -0400
Subject: [PATCH] Define _XOPEN_SOURCE to 600 to make glibc happy.

---
 cmd/wmii/area.c       | 2 +-
 cmd/wmii/bar.c        | 2 +-
 cmd/wmii/client.c     | 2 +-
 cmd/wmii/column.c     | 3 ++-
 cmd/wmii/dat.h        | 3 ++-
 cmd/wmii/event.c      | 2 +-
 cmd/wmii/frame.c      | 2 +-
 cmd/wmii/fs.c         | 3 +--
 cmd/wmii/geom.c       | 2 +-
 cmd/wmii/key.c        | 2 +-
 cmd/wmii/main.c       | 2 +-
 cmd/wmii/map.c        | 2 +-
 cmd/wmii/message.c    | 2 +-
 cmd/wmii/mouse.c      | 2 +-
 cmd/wmii/printevent.c | 2 +-
 cmd/wmii/rule.c       | 2 +-
 cmd/wmii/utf.c        | 2 +-
 cmd/wmii/view.c       | 2 +-
 cmd/wmii/x11.c        | 2 +-
 19 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cmd/wmii/area.c b/cmd/wmii/area.c
index 5a947f22..bce003fe 100644
--- a/cmd/wmii/area.c
+++ b/cmd/wmii/area.c
@@ -2,12 +2,12 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 static void place_frame(Frame *f);
diff --git a/cmd/wmii/bar.c b/cmd/wmii/bar.c
index 84160cf0..7a8c808b 100644
--- a/cmd/wmii/bar.c
+++ b/cmd/wmii/bar.c
@@ -2,9 +2,9 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <stdio.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 static Handlers handlers;
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
index 9da301d2..442224cf 100644
--- a/cmd/wmii/client.c
+++ b/cmd/wmii/client.c
@@ -2,12 +2,12 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
-#include "dat.h"
 #include "fns.h"
 
 #define Mbsearch(k, l, cmp) bsearch(k, l, nelem(l), sizeof(*l), cmp)
diff --git a/cmd/wmii/column.c b/cmd/wmii/column.c
index b5d37e11..09965631 100644
--- a/cmd/wmii/column.c
+++ b/cmd/wmii/column.c
@@ -2,11 +2,12 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include "dat.h"
+#include <strings.h>
 #include "fns.h"
 
 static Image *divimg, *divmask;
diff --git a/cmd/wmii/dat.h b/cmd/wmii/dat.h
index d730f057..0a0594cd 100644
--- a/cmd/wmii/dat.h
+++ b/cmd/wmii/dat.h
@@ -2,9 +2,10 @@
  * See LICENSE file for license details.
  */
 
-#include <regexp9.h>
+#define _XOPEN_SOURCE 600
 #define IXP_P9_STRUCTS
 #define IXP_NO_P9_
+#include <regexp9.h>
 #include <stdint.h>
 #include <ixp.h>
 #include <util.h>
diff --git a/cmd/wmii/event.c b/cmd/wmii/event.c
index a27a84d1..a6bf724a 100644
--- a/cmd/wmii/event.c
+++ b/cmd/wmii/event.c
@@ -1,9 +1,9 @@
 /* Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <stdio.h>
 #include <X11/keysym.h>
-#include "dat.h"
 #include "fns.h"
 #include "printevent.h"
 
diff --git a/cmd/wmii/frame.c b/cmd/wmii/frame.c
index dd0aa906..a96b4e62 100644
--- a/cmd/wmii/frame.c
+++ b/cmd/wmii/frame.c
@@ -1,9 +1,9 @@
 /* Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <math.h>
 #include <stdio.h>
-#include "dat.h"
 #include "fns.h"
 
 uint
diff --git a/cmd/wmii/fs.c b/cmd/wmii/fs.c
index d05af94e..557400c0 100644
--- a/cmd/wmii/fs.c
+++ b/cmd/wmii/fs.c
@@ -1,15 +1,14 @@
 /* Copyright ©2006 Kris Maglione <fbsdaemon at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <ctype.h>
-#include <regex.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "dat.h"
 #include "fns.h"
 
 
diff --git a/cmd/wmii/geom.c b/cmd/wmii/geom.c
index e3a1ebfc..a44f97ce 100644
--- a/cmd/wmii/geom.c
+++ b/cmd/wmii/geom.c
@@ -1,8 +1,8 @@
 /* Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
-#include <stdio.h>
 #include "dat.h"
+#include <stdio.h>
 #include "fns.h"
 
 Bool
diff --git a/cmd/wmii/key.c b/cmd/wmii/key.c
index 3b458d56..95657104 100644
--- a/cmd/wmii/key.c
+++ b/cmd/wmii/key.c
@@ -1,10 +1,10 @@
 /* Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <string.h>
 #include <stdlib.h>
 #include <X11/keysym.h>
-#include "dat.h"
 #include "fns.h"
 
 void
diff --git a/cmd/wmii/main.c b/cmd/wmii/main.c
index b6fcd65b..ad968eae 100644
--- a/cmd/wmii/main.c
+++ b/cmd/wmii/main.c
@@ -2,6 +2,7 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <X11/Xproto.h>
 #include <X11/cursorfont.h>
 #include <errno.h>
@@ -14,7 +15,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include "dat.h"
 #include "fns.h"
 
 static const char
diff --git a/cmd/wmii/map.c b/cmd/wmii/map.c
index 86abfe10..5024bb4f 100644
--- a/cmd/wmii/map.c
+++ b/cmd/wmii/map.c
@@ -1,8 +1,8 @@
 /* Written by Kris Maglione */
 /* Public domain */
+#include "dat.h"
 #include <stdlib.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 /* Edit s/^([a-zA-Z].*)\n([a-z].*) {/\1 \2;/g  x/^([^a-zA-Z]|static|$)/-+d  s/ (\*map|val|*str)//g */
diff --git a/cmd/wmii/message.c b/cmd/wmii/message.c
index 7f61be4a..f46b67b5 100644
--- a/cmd/wmii/message.c
+++ b/cmd/wmii/message.c
@@ -1,12 +1,12 @@
 /* Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 static char
diff --git a/cmd/wmii/mouse.c b/cmd/wmii/mouse.c
index e8c127c3..d0a80842 100644
--- a/cmd/wmii/mouse.c
+++ b/cmd/wmii/mouse.c
@@ -1,11 +1,11 @@
 /* Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 enum {
diff --git a/cmd/wmii/printevent.c b/cmd/wmii/printevent.c
index ea91e335..99e613b6 100644
--- a/cmd/wmii/printevent.c
+++ b/cmd/wmii/printevent.c
@@ -39,12 +39,12 @@
  * ken@richsun.UUCP
  */
 
+#include "dat.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <bio.h>
-#include "dat.h"
 //#include "fns.h"
 #include "printevent.h"
 #include <X11/Xproto.h>
diff --git a/cmd/wmii/rule.c b/cmd/wmii/rule.c
index 5eff2ea3..00aee661 100644
--- a/cmd/wmii/rule.c
+++ b/cmd/wmii/rule.c
@@ -3,10 +3,10 @@
  * See LICENSE file for license details.
  */
 
+#include "dat.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include "dat.h"
 #include "fns.h"
 
 /* basic rule matching language /regex/ -> value
diff --git a/cmd/wmii/utf.c b/cmd/wmii/utf.c
index ee30538c..ca30be16 100644
--- a/cmd/wmii/utf.c
+++ b/cmd/wmii/utf.c
@@ -1,8 +1,8 @@
 /* Public Domain --Kris Maglione */
+#include "dat.h"
 #include <errno.h>
 #include <iconv.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 char*
diff --git a/cmd/wmii/view.c b/cmd/wmii/view.c
index 4b299638..379e3842 100644
--- a/cmd/wmii/view.c
+++ b/cmd/wmii/view.c
@@ -2,10 +2,10 @@
  * Copyright ©2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "dat.h"
 #include "fns.h"
 
 static Bool
diff --git a/cmd/wmii/x11.c b/cmd/wmii/x11.c
index dd1a1664..57cfe2fb 100644
--- a/cmd/wmii/x11.c
+++ b/cmd/wmii/x11.c
@@ -1,6 +1,7 @@
 /* Copyright ©2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
+#include "dat.h"
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
@@ -8,7 +9,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <bio.h>
-#include "dat.h"
 #include "fns.h"
 
 Point ZP = {0, 0};