From 38207a31e41b8cb3f3978c1ccbe10c6467f85c51 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 16 Nov 2019 16:01:13 +0100
Subject: Move feature macro before "config.h" include

This allows to use header includes in "config.h" to reduce the build
configuration checks.

Update #3818.
---
 cpukit/libmisc/shell/hexdump-conv.c     | 7 ++++---
 cpukit/libmisc/shell/hexdump-odsyntax.c | 8 ++++----
 cpukit/libmisc/shell/main_date.c        | 3 ++-
 cpukit/libmisc/shell/main_dd.c          | 3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'cpukit/libmisc')

diff --git a/cpukit/libmisc/shell/hexdump-conv.c b/cpukit/libmisc/shell/hexdump-conv.c
index d37c6d988a..aa16f9b169 100644
--- a/cpukit/libmisc/shell/hexdump-conv.c
+++ b/cpukit/libmisc/shell/hexdump-conv.c
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef __rtems__
+/* For wcwidth() visibility */
+#define _GNU_SOURCE
+#endif /* __rtems__ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -39,9 +43,6 @@
 #ifndef lint
 static const char sccsid[] = "@(#)conv.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
-#else /* __rtems__ */
-/* For wcwidth() visibility */
-#define _GNU_SOURCE
 #endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.9 2006/07/31 14:17:04 jkoshy Exp $");
diff --git a/cpukit/libmisc/shell/hexdump-odsyntax.c b/cpukit/libmisc/shell/hexdump-odsyntax.c
index 8da2a34794..e3c4f3cf64 100644
--- a/cpukit/libmisc/shell/hexdump-odsyntax.c
+++ b/cpukit/libmisc/shell/hexdump-odsyntax.c
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef __rtems__
+/* For asprintf() visibility */
+#define _GNU_SOURCE
+#endif /* __rtems__ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -39,10 +43,6 @@
 #if 0
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
-#ifdef __rtems__
-/* For asprintf() visibility */
-#define _GNU_SOURCE
-#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.17 2004/07/22 13:14:42 johan Exp $");
 #endif
diff --git a/cpukit/libmisc/shell/main_date.c b/cpukit/libmisc/shell/main_date.c
index 6070ff065f..f93e5df016 100644
--- a/cpukit/libmisc/shell/main_date.c
+++ b/cpukit/libmisc/shell/main_date.c
@@ -12,11 +12,12 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#define _XOPEN_SOURCE
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/cpukit/libmisc/shell/main_dd.c b/cpukit/libmisc/shell/main_dd.c
index cff70ce020..1a715303ef 100644
--- a/cpukit/libmisc/shell/main_dd.c
+++ b/cpukit/libmisc/shell/main_dd.c
@@ -31,6 +31,8 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -49,7 +51,6 @@ static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 __FBSDID("$FreeBSD: src/bin/dd/dd.c,v 1.43 2004/08/15 19:10:05 rwatson Exp $");
 #endif
 
-#define _GNU_SOURCE
 #include <rtems.h>
 #include <rtems/shell.h>
 #include <rtems/shellconfig.h>
-- 
cgit v1.2.3