[Xorg-commit] xc/extras/FreeType/lib ttcalc.c,1.1.4.1,1.1.4.2 ttcalc.h,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/extras/FreeType/lib
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/FreeType/lib

Modified Files:
      Tag: XORG-CURRENT
	ttcalc.c ttcalc.h 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: ttcalc.c
===================================================================
RCS file: /cvs/xorg/xc/extras/FreeType/lib/ttcalc.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ttcalc.c	26 Nov 2003 22:48:18 -0000	1.1.4.1
+++ b/ttcalc.c	23 Feb 2004 21:31:53 -0000	1.1.4.2
@@ -14,7 +14,7 @@
  *  understand and accept it fully.
  *
  ******************************************************************/
-/* $XFree86: xc/extras/FreeType/lib/ttcalc.c,v 1.7 2003/11/07 22:34:40 tsi Exp $ */
+/* $XFree86: xc/extras/FreeType/lib/ttcalc.c,v 1.8 2003/12/22 17:48:00 tsi Exp $ */
 
 #include "ttcalc.h"
 #include "ttdebug.h"
@@ -77,6 +77,9 @@
   }
 
 
+#if !defined(TT_MAKE_OPTION_SINGLE_OBJECT) || \
+    !defined(TT_CONFIG_OPTION_NO_INTERPRETER)
+
   LOCAL_FUNC
   Int  Order64( TT_Int64  z )
   {
@@ -92,9 +95,6 @@
   }
 
 
-#if !defined(TT_MAKE_OPTION_SINGLE_OBJECT) || \
-    !defined(TT_CONFIG_OPTION_NO_INTERPRETER)
-
   LOCAL_FUNC
   TT_Int32  Sqrt64( TT_Int64  l )
   {
@@ -350,6 +350,9 @@
   }
 
 
+#if !defined(TT_MAKE_OPTION_SINGLE_OBJECT) || \
+    !defined(TT_CONFIG_OPTION_NO_INTERPRETER)
+
   LOCAL_FUNC
   Int  Order64( TT_Int64*  z )
   {
@@ -377,9 +380,6 @@
   }
 
 
-#if !defined(TT_MAKE_OPTION_SINGLE_OBJECT) || \
-    !defined(TT_CONFIG_OPTION_NO_INTERPRETER)
-
   LOCAL_FUNC
   TT_Int32  Sqrt64( TT_Int64*  l )
   {

Index: ttcalc.h
===================================================================
RCS file: /cvs/xorg/xc/extras/FreeType/lib/ttcalc.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ttcalc.h	26 Nov 2003 22:48:18 -0000	1.1.4.1
+++ b/ttcalc.h	23 Feb 2004 21:31:53 -0000	1.1.4.2
@@ -14,7 +14,7 @@
  *  understand and accept it fully.
  *
  ******************************************************************/
-/* $XFree86: xc/extras/FreeType/lib/ttcalc.h,v 1.2 2003/11/07 22:34:40 tsi Exp $ */
+/* $XFree86: xc/extras/FreeType/lib/ttcalc.h,v 1.3 2003/12/30 18:55:11 tsi Exp $ */
 
 #ifndef TTCALC_H
 #define TTCALC_H
@@ -73,11 +73,10 @@
 
   LOCAL_DEF TT_Int32  Div64by32( TT_Int64*  x, TT_Int32  y );
 
-  LOCAL_DEF int  Order64( TT_Int64*  z );
-
 #if !defined(TT_MAKE_OPTION_SINGLE_OBJECT) || \
     !defined(TT_CONFIG_OPTION_NO_INTERPRETER)
 
+  LOCAL_DEF int  Order64( TT_Int64*  z );
   LOCAL_DEF TT_Int32  Sqrt64( TT_Int64*  l );
 
 #endif