From 57676ad1c0209b3e4fee9043a3850b272fa7f05e Mon Sep 17 00:00:00 2001 From: François Revel Date: Mon, 19 Mar 2012 18:24:43 +0000 Subject: Reworked r13532 in a cleaner way. The FLEX_ARRAY_LEN_DECL macro from utils.h should be used when declaring an empty array at end of struct. svn path=/trunk/netsurf/; revision=13535 --- utils/nsurl.c | 6 +----- utils/utils.h | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'utils') diff --git a/utils/nsurl.c b/utils/nsurl.c index be7cf2c05..8b1b05fc9 100644 --- a/utils/nsurl.c +++ b/utils/nsurl.c @@ -156,11 +156,7 @@ struct nsurl { int count; /* Number of references to NetSurf URL object */ size_t length; /* Length of string */ - char string[ -#if defined(__GNUC__) && (__GNUC__ < 3) - 0 -#endif - ]; /* Full URL as a string */ + char string[FLEX_ARRAY_LEN_DECL]; /* Full URL as a string */ }; diff --git a/utils/utils.h b/utils/utils.h index f00ea286a..02bf75fea 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -52,6 +52,12 @@ #define PRId64 "lld" #endif +#if defined(__GNUC__) && (__GNUC__ < 3) +#define FLEX_ARRAY_LEN_DECL 0 +#else +#define FLEX_ARRAY_LEN_DECL +#endif + #if defined(__HAIKU__) || defined(__BEOS__) #define strtof(s,p) ((float)(strtod((s),(p)))) #endif -- cgit v1.2.3