From dc627931848ed6af40be4f7d5bdb8e33d28b8333 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Tue, 27 Jan 2015 18:07:50 +0000 Subject: Make strnlen() visible in old versions of glibc Strnlen() is in POSIX 2008 but was a GNU extension up to glibc 2.10 requiring to define _GNU_SOURCE. This fixes compilation on CentOS 4.9. Also, move our implementation of strnlen() that was added to support DJGPP to helpers.c. Corresponding to flashrom svn r1878. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- dmi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'dmi.c') diff --git a/dmi.c b/dmi.c index 832d7ab..c9d904b 100644 --- a/dmi.c +++ b/dmi.c @@ -21,6 +21,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +/* strnlen is in POSIX but was a GNU extension up to glibc 2.10 */ +#if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) || __GLIBC__ < 2 +#define _GNU_SOURCE +#else +#define _POSIX_C_SOURCE 200809L +#endif + #include #include #include @@ -86,16 +93,6 @@ static const struct { }; #if CONFIG_INTERNAL_DMI == 1 -#ifdef __DJGPP__ /* There is no strnlen in DJGPP. FIXME: Move this to a common utility file. */ -size_t strnlen(const char *str, size_t n) -{ - size_t i; - for (i = 0; i < n && str[i] != '\0'; i++) - ; - return i; -} -#endif - static bool dmi_checksum(const uint8_t * const buf, size_t len) { uint8_t sum = 0; -- cgit v1.1