Remove use of flexible arrays

Also remove wrong ASSERT_SIZE that would trigger only when not using
flexible arrays (which was the case on win32, but not with gcc).

diff --git a/configure.ac b/configure.ac
index f9ca23b..0cc01b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,6 @@ AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
 AC_PROG_CC
 AC_PROG_CXX
 
-AC_C_FLEXIBLE_ARRAY_MEMBER
-
 AC_CHECK_FUNCS(mprotect sysconf getpagesize)
 AC_CHECK_HEADERS(unistd.h sys/mman.h)
 

diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index a3efaf1..83f6571 100644 (file)
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -241,7 +241,6 @@ struct OpenTypeFontFile
   TTCHeader            ttcHeader[VAR];
   } u;
 };
-ASSERT_SIZE (OpenTypeFontFile, 4);
 
 
 #endif /* HB_OPEN_FILE_PRIVATE_HH */

diff --git a/src/hb-private.h b/src/hb-private.h
index 0f3484e..b33d629 100644 (file)
--- a/src/hb-private.h
+++ b/src/hb-private.h
@@ -82,11 +82,7 @@
 #define ASSERT_SIZE(_type, _size) ASSERT_STATIC (sizeof (_type) == (_size))
 
 /* Size signifying variable-sized array */
-#ifdef FLEXIBLE_ARRAY_MEMBER
-#define VAR FLEXIBLE_ARRAY_MEMBER
-#else
 #define VAR 1
-#endif
 
 #define VAR0 (VAR+0)
 #define ASSERT_SIZE_VAR(_type, _size, _var_type) \