commit 0eb9fc6e37935707dba2bf4b3705de2161a08cb7
author Behdad Esfahbod <behdad@behdad.org> Mon May 10 19:01:17 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon May 10 19:01:17 2010 -0400
tree 2a13c2d745b320556c386e4bb0a4e9dde0abd6d0
parent 596e471aa5053d955fb5d5b5923088c8814469b1

Change DEFINE_SIZE_VAR to DEFINE_SIZE_ARRAY

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 5194771..17a037b 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -103,11 +103,11 @@
   _DEFINE_SIZE_ASSERTION (sizeof (*this) >= (size)); \
   static const unsigned int min_size = (size)
 
-#define DEFINE_SIZE_VAR(size, _var_type) \
-  _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + VAR0 * sizeof (_var_type)); \
+#define DEFINE_SIZE_ARRAY(size, array) \
+  _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + array[0].static_size); \
   static const unsigned int min_size = (size)
 
-#define DEFINE_SIZE_VAR2(size, array1, array2) \
+#define DEFINE_SIZE_ARRAY2(size, array1, array2) \
   _DEFINE_SIZE_ASSERTION (sizeof (*this) == (size) + this->array1[0].static_size + this->array2[0].static_size); \
   static const unsigned int min_size = (size)
 
@@ -586,7 +586,7 @@
   LenType len;
   Type array[VAR];
   public:
-  DEFINE_SIZE_VAR (sizeof (LenType), Type);
+  DEFINE_SIZE_ARRAY (sizeof (LenType), array);
 };
 
 /* An array with a USHORT number of elements. */
@@ -671,7 +671,7 @@
   USHORT len;
   Type array[VAR];
   public:
-  DEFINE_SIZE_VAR (sizeof (USHORT), Type);
+  DEFINE_SIZE_ARRAY (sizeof (USHORT), array);
 };