rename freetype.c and freetype.h to freetype1.c and freetype1.h respectively, in order to avoid conflict with the freetype.h of freetype2

src/font/Makefile.am

@@ -5,13 +5,13 @@ noinst_LTLIBRARIES = libfont.la
 SRC_FILES = charset.c charset-arabic.c charset-bidi.c \
             sysfont.c logfont.c devfont.c fontname.c \
 			rawbitmap.c varbitmap.c qpf.c upf.c \
-            fontcache.c freetype.c freetype2.c font-engines.c\
+            fontcache.c freetype1.c freetype2.c font-engines.c\
             gbunimap.c gbkunimap.c gb18030unimap.c big5unimap.c \
             ujisunimap.c sjisunimap.c euckrunimap.c \
             textops.c mapunitogb.c mapunitogbk.c mapunitobig5.c mapunitogb18030.c \
             bitmapfont.c scripteasy.c
 
-HDR_FILES = charset.h rawbitmap.h varbitmap.h freetype.h freetype2.h qpf.h  \
+HDR_FILES = charset.h rawbitmap.h varbitmap.h freetype1.h freetype2.h qpf.h  \
 			upf.h bitmapfont.h gunicode.h gunichartables.h se_minigui.h
 
 EXTRA_DIST = convgbmap.c jisunimap.c $(SRC_FILES) $(HDR_FILES) \

src/font/freetype1.c

@@ -32,7 +32,7 @@
  *   <http://www.minigui.com/en/about/licensing-policy/>.
  */
 /*
-** freetype.c: TrueType font support based on FreeType 1.3.1.
+** freetype1.c: TrueType font support based on FreeType 1.3.1.
 ** 
 ** Create date: 2000/08/21
 */
@@ -53,7 +53,7 @@
 
 #if defined(_MGFONT_TTF) && !defined(_MGFONT_FT2)
 
-#include "freetype.h"
+#include "freetype1.h"
 
 #if TT_FREETYPE_MAJOR != 1 | TT_FREETYPE_MINOR < 3
     #error "You must link with freetype lib version 1.3.x +, and not freetype 2. \

src/font/freetype1.h

@@ -32,7 +32,7 @@
  *   <http://www.minigui.com/en/about/licensing-policy/>.
  */
 /*
-** freetype.h: TrueType font support based on FreeType.
+** freetype1.h: TrueType font support based on FreeType V1.3.x.
 **
 ** Created by WEI Yongming, 2000/8/21
 */