Commit de6b58a

nsxivde6b58a

Unified feature test macro requirements

+10 −10

4 files changed

−Context 3+

M image.c View

M options.c View

M thumbs.c View

M window.c View

		@@ -16,8 +16,6 @@
16	16		* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
17	17		*/
18	18
19		−	#define _IMAGE_CONFIG
20		−
21	19		#include <unistd.h>
22	20
23	21		#ifdef HAVE_GIFLIB
		@@ -30,6 +28,8 @@
30	28		#include "image.h"
31	29		#include "options.h"
32	30		#include "util.h"
	31	+
	32	+	#define _IMAGE_CONFIG
33	33		#include "config.h"
34	34
35	35		enum { MIN_GIF_DELAY = 50 };

		@@ -16,16 +16,17 @@
16	16		* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
17	17		*/
18	18
19		−	#define _XOPEN_SOURCE
20		−	#define _IMAGE_CONFIG
	19	+	#define _POSIX_C_SOURCE 2 /* for getopt(3) */
	20	+	#include <unistd.h>
21	21
22	22		#include <stdlib.h>
23	23		#include <string.h>
24	24		#include <stdio.h>
25		−	#include <unistd.h>
26	25
27	26		#include "options.h"
28	27		#include "util.h"
	28	+
	29	+	#define _IMAGE_CONFIG
29	30		#include "config.h"
30	31
31	32		options_t _options;

		@@ -16,8 +16,6 @@
16	16		* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
17	17		*/
18	18
19		−	#define _THUMBS_CONFIG
20		−
21	19		#include <stdlib.h>
22	20		#include <string.h>
23	21		#include <sys/time.h>
		@@ -27,6 +25,8 @@
27	25
28	26		#include "thumbs.h"
29	27		#include "util.h"
	28	+
	29	+	#define _THUMBS_CONFIG
30	30		#include "config.h"
31	31
32	32		#ifdef __NetBSD__

		@@ -16,16 +16,15 @@
16	16		* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301, USA.
17	17		*/
18	18
19		−	#define _WINDOW_CONFIG
20		−
21	19		#include <string.h>
22		−
23	20		#include <X11/Xutil.h>
24	21		#include <X11/cursorfont.h>
25	22
26	23		#include "options.h"
27	24		#include "util.h"
28	25		#include "window.h"
	26	+
	27	+	#define _WINDOW_CONFIG
29	28		#include "config.h"
30	29
31	30		static Cursor carrow;