From d94d983d1bed2d0f5ffb03b8b5469d7e59e839de Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 14 Mar 2016 16:19:42 -0500
Subject: [PATCH] Feature test macros overhaul: fnmatch.h

Use the proper internal macro for GNU extensions.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
 newlib/libc/include/fnmatch.h   | 6 +++---
 winsup/cygwin/include/fnmatch.h | 6 +++---
 winsup/cygwin/libc/fnmatch.c    | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/newlib/libc/include/fnmatch.h b/newlib/libc/include/fnmatch.h
index 06311fc4b..a94e923a4 100644
--- a/newlib/libc/include/fnmatch.h
+++ b/newlib/libc/include/fnmatch.h
@@ -33,21 +33,21 @@
 #ifndef	_FNMATCH_H_
 #define	_FNMATCH_H_
 
+#include <sys/cdefs.h>
+
 #define	FNM_NOMATCH	1	/* Match failed. */
 
 #define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
 #define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
 #define	FNM_PERIOD	0x04	/* Period must be matched by period. */
 
-#if defined(_GNU_SOURCE) || !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+#if __GNU_VISIBLE
 #define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
 #define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
 #define	FNM_IGNORECASE	FNM_CASEFOLD
 #define	FNM_FILE_NAME	FNM_PATHNAME
 #endif
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 int	 fnmatch(const char *, const char *, int);
 __END_DECLS
diff --git a/winsup/cygwin/include/fnmatch.h b/winsup/cygwin/include/fnmatch.h
index e4500abe2..556d3b1da 100644
--- a/winsup/cygwin/include/fnmatch.h
+++ b/winsup/cygwin/include/fnmatch.h
@@ -39,21 +39,21 @@
 #ifndef _FNMATCH_H_
 #define _FNMATCH_H_
 
+#include <sys/cdefs.h>
+
 #define FNM_NOMATCH        1        /* Match failed. */
 #define FNM_NOSYS        2        /* Function not supported (unused). */
 
 #define FNM_NOESCAPE        0x01        /* Disable backslash escaping. */
 #define FNM_PATHNAME        0x02        /* Slash must be matched by slash. */
 #define FNM_PERIOD        0x04        /* Period must be matched by period. */
-#ifndef _POSIX_SOURCE
+#if __GNU_VISIBLE
 #define FNM_LEADING_DIR        0x08        /* Ignore /<tail> after Imatch. */
 #define FNM_CASEFOLD        0x10        /* Case insensitive search. */
 #define FNM_IGNORECASE        FNM_CASEFOLD
 #define FNM_FILE_NAME        FNM_PATHNAME
 #endif
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 int      fnmatch __P((const char *, const char *, int));
 __END_DECLS
diff --git a/winsup/cygwin/libc/fnmatch.c b/winsup/cygwin/libc/fnmatch.c
index 8c386787b..fc4376510 100644
--- a/winsup/cygwin/libc/fnmatch.c
+++ b/winsup/cygwin/libc/fnmatch.c
@@ -38,6 +38,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #endif /* LIBC_SCCS and not lint */
+#include "winsup.h"
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: head/lib/libc/gen/fnmatch.c 288309 2015-09-27 12:52:18Z jilles $");