[PATCH] scripts: fix warning generated by glibc 2.20

[PATCH] scripts: fix warning generated by glibc 2.20

[Lucas Stach]

Defining only _BSD_SOURCE is deprecated with version 2.20 of
glibc. It has been replaced by _DEFAULT_SOURCE. The manpage says
that code which wants to work in the same way on both old and new
versions of glibc should simply define both symbols.

Also move the definition up in fix_size as those feature flags
should be defined before including any standard headers.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 scripts/fix_size.c      | 6 +++---
 scripts/mk-omap-image.c | 1 +
 scripts/mkublheader.c   | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/fix_size.c b/scripts/fix_size.c
index c7dcd5ff6b60..7014a3faf611 100644
--- a/scripts/fix_size.c
+++ b/scripts/fix_size.c
@@ -1,3 +1,6 @@
+#define _BSD_SOURCE             /* See feature_test_macros(7) */
+#define _DEFAULT_SOURCE
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -6,9 +9,6 @@
 #include <unistd.h>
 #include <stdint.h>
 #include <fcntl.h>
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE             /* See feature_test_macros(7) */
-#endif
 #include <endian.h>
 
 int main(int argc, char**argv)
diff --git a/scripts/mk-omap-image.c b/scripts/mk-omap-image.c
index d0335ad1747d..1d61a34e6507 100644
--- a/scripts/mk-omap-image.c
+++ b/scripts/mk-omap-image.c
@@ -34,6 +34,7 @@
  */
 
 #define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/scripts/mkublheader.c b/scripts/mkublheader.c
index b61630a25fb8..5464a8061176 100644
--- a/scripts/mkublheader.c
+++ b/scripts/mkublheader.c
@@ -19,6 +19,7 @@
  */
 
 #define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 
 #include <stdio.h>
 #include <sys/types.h>
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] scripts: fix warning generated by glibc 2.20

[Sascha Hauer]

On Sun, Mar 01, 2015 at 06:53:29PM +0100, Lucas Stach wrote:
> Defining only _BSD_SOURCE is deprecated with version 2.20 of
> glibc. It has been replaced by _DEFAULT_SOURCE. The manpage says
> that code which wants to work in the same way on both old and new
> versions of glibc should simply define both symbols.
> 
> Also move the definition up in fix_size as those feature flags
> should be defined before including any standard headers.
> 
> Signed-off-by: Lucas Stach <dev@lynxeye.de>
> ---
>  scripts/fix_size.c      | 6 +++---
>  scripts/mk-omap-image.c | 1 +
>  scripts/mkublheader.c   | 1 +
>  3 files changed, 5 insertions(+), 3 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox