date: 2001/03/06 13:55:38;  author: werner;  state: Exp;  lines: +9 -3

Moved GDEF_ID, GPOS_ID, and GSUB_ID from .c to .h files.

Index: ftxgdef.c
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgdef.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- ftxgdef.c	2001/03/05 21:07:50	1.11
+++ ftxgdef.c	2001/03/06 13:55:38	1.12
@@ -26,9 +26,6 @@
 #include "ftxopenf.h"
 
 
-#define GDEF_ID  Build_Extension_ID( 'G', 'D', 'E', 'F' )
-
-
   static TT_Error  Load_AttachList( TTO_AttachList*  al,
                                     PFace            input );
   static TT_Error  Load_LigCaretList( TTO_LigCaretList*  lcl,
Index: ftxgdef.h
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgdef.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ftxgdef.h	2001/03/05 21:07:50	1.7
+++ ftxgdef.h	2001/03/06 13:55:38	1.8
@@ -29,6 +29,8 @@ extern "C" {
 #define TTO_Err_Invalid_GDEF_SubTable_Format  0x1030
 #define TTO_Err_Invalid_GDEF_SubTable         0x1031
 
+#define GDEF_ID  Build_Extension_ID( 'G', 'D', 'E', 'F' )
+
 
 /* GDEF glyph classes */
 
Index: ftxgpos.c
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgpos.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ftxgpos.c	2001/03/05 21:07:50	1.9
+++ ftxgpos.c	2001/03/06 13:55:38	1.10
@@ -32,9 +32,6 @@
 #include "ftxopenf.h"
 
 
-#define GPOS_ID  Build_Extension_ID( 'G', 'P', 'O', 'S' )
-
-
   struct  GPOS_Instance_
   {
     TTO_GPOSHeader*  gpos;
Index: ftxgpos.h
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgpos.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ftxgpos.h	2000/01/05 01:16:06	1.12
+++ ftxgpos.h	2001/03/06 13:55:38	1.13
@@ -29,6 +29,8 @@ extern "C" {
 #define TTO_Err_Invalid_GPOS_SubTable_Format  0x1020
 #define TTO_Err_Invalid_GPOS_SubTable         0x1021
 
+#define GPOS_ID  Build_Extension_ID( 'G', 'P', 'O', 'S' )
+
 
 /* Lookup types for glyph positioning */
 
Index: ftxgsub.c
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgsub.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ftxgsub.c	2001/03/05 21:07:50	1.38
+++ ftxgsub.c	2001/03/06 13:55:38	1.39
@@ -32,9 +32,6 @@
 #include "ftxopenf.h"
 
 
-#define GSUB_ID  Build_Extension_ID( 'G', 'S', 'U', 'B' )
-
-
 #define ADD_String( in, num_in, out, num_out, glyph_data, component, ligID ) \
           ( ( error = TT_GSUB_Add_String( (in), (num_in),                    \
                                           (out), (num_out),                  \
Index: ftxgsub.h
===================================================================
RCS file: /cvs/freetype/freetype/lib/extend/ftxgsub.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ftxgsub.h	2000/01/05 01:16:06	1.28
+++ ftxgsub.h	2001/03/06 13:55:38	1.29
@@ -29,6 +29,8 @@ extern "C" {
 #define TTO_Err_Invalid_GSUB_SubTable_Format  0x1010
 #define TTO_Err_Invalid_GSUB_SubTable         0x1011
 
+#define GSUB_ID  Build_Extension_ID( 'G', 'S', 'U', 'B' )
+
 
 /* Lookup types for glyph substitution */