===================================================================
RCS file: /cvs/gnome/nautilus/cut-n-paste-code/freetype/ftcalc.h,v
retrieving revision 1.1
diff -u -p -r1.1 ftcalc.h
--- cut-n-paste-code/freetype/ftcalc.h	2000/07/19 07:19:46	1.1
+++ cut-n-paste-code/freetype/ftcalc.h	2000/08/04 21:11:59
@@ -22,12 +22,12 @@
 #ifdef FT_FLAT_COMPILE
 
 #include "freetype.h"
-#include "ftconfig.h"   /* for LONG64 */
+#include "ftconfig.h"   /* for FT_LONG64 */
 
 #else
 
 #include <freetype/freetype.h>
-#include <freetype/config/ftconfig.h>   /* for LONG64 */
+#include <freetype/config/ftconfig.h>   /* for FT_LONG64 */
 
 #endif
 
@@ -36,10 +36,10 @@
 #endif
 
 
-#ifdef LONG64
+#ifdef FT_LONG64
 
 
-  typedef INT64  FT_Int64;
+  typedef FT_INT64  FT_Int64;
 
 #define ADD_64( x, y, z )  z = (x) + (y)
 #define MUL_64( x, y, z )  z = (FT_Int64)(x) * (y)
@@ -54,7 +54,7 @@
 
 #endif /* FT_CONFIG_OPTION_OLD_CALCS */
 
-#else /* LONG64 */
+#else /* FT_LONG64 */
 
 
   typedef struct  FT_Int64_
@@ -87,7 +87,7 @@
 
 #endif /* OLD_CALC */
 
-#endif /* LONG64 */
+#endif /* FT_LONG64 */
 
 
 #ifndef FT_CONFIG_OPTION_OLD_CALCS
Index: cut-n-paste-code/freetype/ftconfig.h
===================================================================
RCS file: /cvs/gnome/nautilus/cut-n-paste-code/freetype/ftconfig.h,v
retrieving revision 1.1
diff -u -p -r1.1 ftconfig.h
--- cut-n-paste-code/freetype/ftconfig.h	2000/07/19 07:19:46	1.1
+++ cut-n-paste-code/freetype/ftconfig.h	2000/08/04 21:11:59
@@ -170,8 +170,10 @@
   /*                                                                       */
 #ifdef FTCALC_USE_LONG_LONG
 
+#ifndef FT_LONG64
 #define FT_LONG64
 #define FT_INT64   long long
+#endif
 
 #endif /* FTCALC_USE_LONG_LONG */
 #endif