Edward O'Callaghan has uploaded this change for review.

View Change

Makefile: Explicitly set '-std=c99 -D_GNU_SOURCE'

Fix dmi.c while we are here to avoid a re-define of
_GNU_SOURCE.

BUG=none
TEST=`make` with both gcc and clang.

Change-Id: I4f973927fc018510a3beaa6c4fa2f356c77c7a6e
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M Makefile
M dmi.c
2 files changed, 3 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/08/47908/1

diff --git a/Makefile b/Makefile
index 0498624..b9e3244 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
 DIFF    = diff
 PREFIX  ?= /usr/local
 MANDIR  ?= $(PREFIX)/share/man
-CFLAGS  ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings
+CFLAGS  ?= -std=c99 -D_GNU_SOURCE -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings
 EXPORTDIR ?= .
 RANLIB  ?= ranlib
 PKG_CONFIG ?= pkg-config
diff --git a/dmi.c b/dmi.c
index c44221c..3b717cd 100644
--- a/dmi.c
+++ b/dmi.c
@@ -19,7 +19,9 @@
 
 /* strnlen is in POSIX but was a GNU extension up to glibc 2.10 */
 #if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) || __GLIBC__ < 2
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif /* !GNU_SOURCE */
 #else
 #define _POSIX_C_SOURCE 200809L
 #endif

To view, visit change 47908. To unsubscribe, or for help writing mail filters, visit settings.