formatting

3 files changed, 48 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 8102a5fee..83137f6de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,14 @@
 2001-04-20  David Turner  <david@freetype.org>
 
-	* ftconfig.h, ftoption.h: updated "ftconfig.h" to detect 64-bit int
-	types on platforms where Autoconf is not available). Also removed
-	FTCALC_USE_LONG_LONG and replaced it with FT_CONFIG_OPTION_FORCE_INT64
-	
-	* builds/win32/freetype.dsp: updated the Visual C++ project file. Doesn't
-	create a DLL yet..
-
-	* cffgload.c: removed a compilation warning
+	* ftconfig.h, ftoption.h: Updated "ftconfig.h" to detect 64-bit int
+	types on platforms where Autoconf is not available.  Also removed
+	FTCALC_USE_LONG_LONG and replaced it with
+	FT_CONFIG_OPTION_FORCE_INT64.
+
+	* builds/win32/freetype.dsp: Updated the Visual C++ project file.
+	Doesn't create a DLL yet.
+
+	* cffgload.c: Removed a compilation warning.
 
 2001-04-10  Tom Kacvinsky  <tjk@ams.org>
 
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index b41916478..225bae5f5 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -128,44 +128,43 @@ FT_BEGIN_HEADER
 #endif
 
 
-  /* determine wether we have a 64-bit int type for platforms without */
-  /* Autoconf..                                                       */
-  /*                                                                  */
+  /* determine whether we have a 64-bit int type for platforms without */
+  /* Autoconf                                                          */
 #if FT_SIZEOF_LONG == 8
 
   /* FT_LONG64 must be defined if a 64-bit type is available */
-#  define FT_LONG64
-#  define FT_INT64   long
+#define FT_LONG64
+#define FT_INT64  long
 
-#elif defined(_MSC_VER)      /* Visual C++ (and Intel C++) */
+#elif defined( _MSC_VER )      /* Visual C++ (and Intel C++) */
 
-    /* this compiler provides the __int64 type */
-#    define FT_LONG64
-#    define FT_INT64  __int64
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64  __int64
 
-#  elif defined(__BORLANDC__)  /* Borland C++ */
+#elif defined( __BORLANDC__ )  /* Borland C++ */
 
-	/* XXXX: we should probably check the value of __BORLANDC__ in order */
-	/*       to test the compiler version..                              */
+  /* XXXX: We should probably check the value of __BORLANDC__ in order */
+  /*       to test the compiler version.                               */
 
-    /* this compiler provides the __int64 type */
-#    define FT_LONG64
-#    define FT_INT64  __int64
+  /* this compiler provides the __int64 type */
+#define FT_LONG64
+#define FT_INT64  __int64
 
-#  elif defined(__WATCOMC__)   /* Watcom C++ */
+#elif defined( __WATCOMC__ )   /* Watcom C++ */
 
-    /* Watcom doesn't provide 64-bit data types */
+  /* Watcom doesn't provide 64-bit data types */
 
-#  elif defined(__MWKS__)      /* Metrowerks CodeWarrior */
+#elif defined( __MWKS__ )      /* Metrowerks CodeWarrior */
 
-    /* I don't know if it provides 64-bit data types, any suggestion */
-	/* is welcomed there..                                           */
+  /* I don't know if it provides 64-bit data types, any suggestion */
+  /* is welcome.                                                   */
 
-#  elif defined(__GNUC__)
+#elif defined( __GNUC__ )
 
-    /* GCC provides the "long long" type */
-#    define FT_LONG64
-#    define FT_INT64   long long int
+  /* GCC provides the "long long" type */
+#define FT_LONG64
+#define FT_INT64  long long int
 
 #endif /* !FT_LONG64 */
 
@@ -173,29 +172,23 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* A 64-bit data type will create compilation problems if you compile    */
-  /* in strict ANSI mode. To avoid them, we disable their use if           */
-  /* __STDC__ is defined. You can however ignore this rule by              */
-  /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro..       */
+  /* in strict ANSI mode.  To avoid them, we disable their use if          */
+  /* __STDC__ is defined.  You can however ignore this rule by             */
+  /* defining the FT_CONFIG_OPTION_FORCE_INT64 configuration macro.        */
   /*                                                                       */
-#if defined(FT_LONG64) && !defined(FT_CONFIG_OPTION_FORCE_INT64)
+#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 )
 
-#  ifdef __STDC__
+#ifdef __STDC__
 
-    /* undefine the 64-bit macros in strict ANSI compilation mode */
-#    undef FT_LONG64
-#    undef FT_INT64
+  /* undefine the 64-bit macros in strict ANSI compilation mode */
+#undef FT_LONG64
+#undef FT_INT64
 
-#  endif /* __STDC__ */
+#endif /* __STDC__ */
 
 #endif /* FT_LONG64 && !FT_CONFIG_OPTION_FORCE_INT64 */
 
 
-
-
-
-
-
-
 #ifdef FT_MAKE_OPTION_SINGLE_OBJECT
 
 #define FT_LOCAL      static
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 58f121786..fa56500f9 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -140,19 +140,19 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* Many compilers provide a non-ANSI 64-bit data type that can be used   */
-  /* by FreeType to speed up some computations. However, this will create  */
+  /* by FreeType to speed up some computations.  However, this will create */
   /* some problems when compiling the library in strict ANSI mode.         */
   /*                                                                       */
   /* For this reason, the use of 64-bit ints is normally disabled when     */
-  /* the __STDC__ macro is defined. You can however disable this by        */
-  /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64                  */
+  /* the __STDC__ macro is defined.  You can however disable this by       */
+  /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64.                 */
   /*                                                                       */
   /* For most compilers, this will only create compilation warnings        */
-  /* when building the library..                                           */
+  /* when building the library.                                            */
   /*                                                                       */
-  /* ObNote: the compiler-specific 64-bit integers are detected in the     */
+  /* ObNote: The compiler-specific 64-bit integers are detected in the     */
   /*         file "ftconfig.h" either statically, or through Autoconf      */
-  /*         on platforms that support it..                                */
+  /*         on platforms that support it.                                 */
   /*                                                                       */
 #define FT_CONFIG_OPTION_FORCE_INT64
 
@@ -210,10 +210,10 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /*   Don't define any of these macros to compile in `release' mode!      */
   /*                                                                       */
-
 /* #define  FT_DEBUG_LEVEL_ERROR */
 /* #define  FT_DEBUG_LEVEL_TRACE */
 
+
   /*************************************************************************/
   /*                                                                       */
   /* Computation Algorithms                                                */