Simplifying the FIELD_* and FRAME_* macros. Before calling these macros,

you should #define FT_STRUCTURE to the structure which will be filled.

Replaced FT_FIELD_REF with FT_FIELD_SIZE, FT_FIELD_SIZE_DELTA, and
FT_FIELD_OFFSET to make the code more readable; additionally, it should be
more portable because we no longer cast a pointer to an FT_UShort (which
e.g. fails with Sun's C++ compiler) but computes the difference between two
pointers which is guaranteed to work.

Fixing warnings (and C++ errors) while using Sun's latest cc and CC
incarnations.  Most of them are related to variable shadowing.

1 files changed, 50 insertions, 41 deletions

diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 470440a2c..afba6e3d0 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -46,64 +46,73 @@
   static
   const FT_Frame_Field  winmz_header_fields[] =
   {
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  WinMZ_Header
+
     FT_FRAME_START( 64 ),
-    FT_FRAME_USHORT_LE ( WinMZ_Header, magic ),
+    FT_FRAME_USHORT_LE ( magic ),
     FT_FRAME_SKIP_BYTES( 29 * 2 ),
-    FT_FRAME_ULONG_LE  ( WinMZ_Header, lfanew ),
+    FT_FRAME_ULONG_LE  ( lfanew ),
     FT_FRAME_END
   };
 
   static
   const FT_Frame_Field  winne_header_fields[] =
   {
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  WinNE_Header
+
     FT_FRAME_START( 40 ),
-    FT_FRAME_USHORT_LE ( WinNE_Header, magic ),
+    FT_FRAME_USHORT_LE ( magic ),
     FT_FRAME_SKIP_BYTES( 34 ),
-    FT_FRAME_USHORT_LE ( WinNE_Header, resource_tab_offset ),
-    FT_FRAME_USHORT_LE ( WinNE_Header, rname_tab_offset ),
+    FT_FRAME_USHORT_LE ( resource_tab_offset ),
+    FT_FRAME_USHORT_LE ( rname_tab_offset ),
     FT_FRAME_END
   };
 
   static
   const FT_Frame_Field  winfnt_header_fields[] =
   {
+#undef  FT_STRUCTURE
+#define FT_STRUCTURE  WinFNT_Header
+
     FT_FRAME_START( 134 ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, version ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, file_size ),
-    FT_FRAME_BYTES    ( WinFNT_Header, copyright, 60 ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, file_type ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, nominal_point_size ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, vertical_resolution ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, horizontal_resolution ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, ascent ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, internal_leading ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, external_leading ),
-    FT_FRAME_BYTE     ( WinFNT_Header, italic ),
-    FT_FRAME_BYTE     ( WinFNT_Header, underline ),
-    FT_FRAME_BYTE     ( WinFNT_Header, strike_out ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, weight ),
-    FT_FRAME_BYTE     ( WinFNT_Header, charset ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, pixel_width ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, pixel_height ),
-    FT_FRAME_BYTE     ( WinFNT_Header, pitch_and_family ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, avg_width ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, max_width ),
-    FT_FRAME_BYTE     ( WinFNT_Header, first_char ),
-    FT_FRAME_BYTE     ( WinFNT_Header, last_char ),
-    FT_FRAME_BYTE     ( WinFNT_Header, default_char ),
-    FT_FRAME_BYTE     ( WinFNT_Header, break_char ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, bytes_per_row ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, device_offset ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, face_name_offset ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, bits_pointer ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, bits_offset ),
-    FT_FRAME_BYTE     ( WinFNT_Header, reserved ),
-    FT_FRAME_ULONG_LE ( WinFNT_Header, flags ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, A_space ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, B_space ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, C_space ),
-    FT_FRAME_USHORT_LE( WinFNT_Header, color_table_offset ),
-    FT_FRAME_BYTES    ( WinFNT_Header, reserved, 4 ),
+    FT_FRAME_USHORT_LE( version ),
+    FT_FRAME_ULONG_LE ( file_size ),
+    FT_FRAME_BYTES    ( copyright, 60 ),
+    FT_FRAME_USHORT_LE( file_type ),
+    FT_FRAME_USHORT_LE( nominal_point_size ),
+    FT_FRAME_USHORT_LE( vertical_resolution ),
+    FT_FRAME_USHORT_LE( horizontal_resolution ),
+    FT_FRAME_USHORT_LE( ascent ),
+    FT_FRAME_USHORT_LE( internal_leading ),
+    FT_FRAME_USHORT_LE( external_leading ),
+    FT_FRAME_BYTE     ( italic ),
+    FT_FRAME_BYTE     ( underline ),
+    FT_FRAME_BYTE     ( strike_out ),
+    FT_FRAME_USHORT_LE( weight ),
+    FT_FRAME_BYTE     ( charset ),
+    FT_FRAME_USHORT_LE( pixel_width ),
+    FT_FRAME_USHORT_LE( pixel_height ),
+    FT_FRAME_BYTE     ( pitch_and_family ),
+    FT_FRAME_USHORT_LE( avg_width ),
+    FT_FRAME_USHORT_LE( max_width ),
+    FT_FRAME_BYTE     ( first_char ),
+    FT_FRAME_BYTE     ( last_char ),
+    FT_FRAME_BYTE     ( default_char ),
+    FT_FRAME_BYTE     ( break_char ),
+    FT_FRAME_USHORT_LE( bytes_per_row ),
+    FT_FRAME_ULONG_LE ( device_offset ),
+    FT_FRAME_ULONG_LE ( face_name_offset ),
+    FT_FRAME_ULONG_LE ( bits_pointer ),
+    FT_FRAME_ULONG_LE ( bits_offset ),
+    FT_FRAME_BYTE     ( reserved ),
+    FT_FRAME_ULONG_LE ( flags ),
+    FT_FRAME_USHORT_LE( A_space ),
+    FT_FRAME_USHORT_LE( B_space ),
+    FT_FRAME_USHORT_LE( C_space ),
+    FT_FRAME_USHORT_LE( color_table_offset ),
+    FT_FRAME_BYTES    ( reserved, 4 ),
     FT_FRAME_END
   };