diff options
| author | François Revel <mmu_man@netsurf-browser.org> | 2012-03-19 18:24:43 +0000 |
|---|---|---|
| committer | François Revel <mmu_man@netsurf-browser.org> | 2012-03-19 18:24:43 +0000 |
| commit | 57676ad1c0209b3e4fee9043a3850b272fa7f05e (patch) | |
| tree | 9f4ef6095a06b9a0955e2a2377fadab0aaaeaa4a /utils | |
| parent | 18b3ae0dec117ec313b83fa314a7c5578f46e223 (diff) | |
| download | netsurf-57676ad1c0209b3e4fee9043a3850b272fa7f05e.tar.gz netsurf-57676ad1c0209b3e4fee9043a3850b272fa7f05e.tar.bz2 | |
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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/nsurl.c | 6 | ||||
| -rw-r--r-- | utils/utils.h | 6 |
2 files changed, 7 insertions, 5 deletions
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 |