Using MAX_QPATH for filenames in ft2.

__uint32 is actually unsigned __int32

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9653 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/ft2.c b/ft2.c
index 23b34b69a37ccf75c1e57a477175e6f279c1926c..1fd78bd31349e47387c8129e310855e6eaea62d1 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -396,7 +396,7 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt)
 static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font)
 {
        size_t namelen;
-       char filename[PATH_MAX];
+       char filename[MAX_QPATH];
        int status;
        size_t i;
        unsigned char *data;
@@ -735,7 +735,7 @@ void Font_UnloadFont(ft2_font_t *font)
 
 static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ch, ft2_font_map_t **outmap)
 {
-       char map_identifier[PATH_MAX];
+       char map_identifier[MAX_QPATH];
        unsigned long mapidx = _ch / FONT_CHARS_PER_MAP;
        unsigned char *data;
        FT_ULong ch, mapch;

diff --git a/ft2_defs.h b/ft2_defs.h
index 7d73745c3cafb595611447a34c691d2fe7459e96..c8d38c6e98b7a589457e8a986bfcc3a4c28885f4 100644 (file)
--- a/ft2_defs.h
+++ b/ft2_defs.h
@@ -6,7 +6,7 @@
 
 #ifdef _MSC_VER
 typedef __int32 FT_Int32;
-typedef __uint32 FT_UInt32;
+typedef unsigned __int32 FT_UInt32;
 #else
 # include <stdint.h>
 typedef int32_t FT_Int32;