From de6b58a3156e64963f5bf48fa446bfbf3bb9da3f Mon Sep 17 00:00:00 2001
From: Bert <ber.t@gmx.com>
Date: Sat, 3 Sep 2011 14:22:06 +0200
Subject: [PATCH] Unified feature test macro requirements

---
 image.c   | 4 ++--
 options.c | 7 ++++---
 thumbs.c  | 4 ++--
 window.c  | 5 ++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/image.c b/image.c
index ecba864..3a572dc 100644
--- a/image.c
+++ b/image.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _IMAGE_CONFIG
-
 #include <unistd.h>
 
 #ifdef HAVE_GIFLIB
@@ -30,6 +28,8 @@
 #include "image.h"
 #include "options.h"
 #include "util.h"
+
+#define _IMAGE_CONFIG
 #include "config.h"
 
 enum { MIN_GIF_DELAY = 50 };
diff --git a/options.c b/options.c
index e45c2b7..e05c2cc 100644
--- a/options.c
+++ b/options.c
@@ -16,16 +16,17 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _XOPEN_SOURCE
-#define _IMAGE_CONFIG
+#define _POSIX_C_SOURCE 2 /* for getopt(3) */
+#include <unistd.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include "options.h"
 #include "util.h"
+
+#define _IMAGE_CONFIG
 #include "config.h"
 
 options_t _options;
diff --git a/thumbs.c b/thumbs.c
index 425970d..052db50 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _THUMBS_CONFIG
-
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -27,6 +25,8 @@
 
 #include "thumbs.h"
 #include "util.h"
+
+#define _THUMBS_CONFIG
 #include "config.h"
 
 #ifdef __NetBSD__
diff --git a/window.c b/window.c
index 48c5085..69c3abb 100644
--- a/window.c
+++ b/window.c
@@ -16,16 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
  */
 
-#define _WINDOW_CONFIG
-
 #include <string.h>
-
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 
 #include "options.h"
 #include "util.h"
 #include "window.h"
+
+#define _WINDOW_CONFIG
 #include "config.h"
 
 static Cursor carrow;