diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-11-14 20:40:42 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-11-14 20:40:42 +0000 |
| commit | 70a8aeb19223cc6db9ff6fc1335e3ef94bbb9253 (patch) | |
| tree | 05c6445c7f9b1a1948da7ab1f51faf814f1f90ac /src/fontfile/dirfile.c | |
| parent | 659b2a75a690838dc37ae488d0295c4c594978ce (diff) | |
Bug #5047: Make font directory attribs work in modular.XORG-6_8_99_903
Diffstat (limited to 'src/fontfile/dirfile.c')
| -rw-r--r-- | src/fontfile/dirfile.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c index 5004922..f390391 100644 --- a/src/fontfile/dirfile.c +++ b/src/fontfile/dirfile.c @@ -58,10 +58,8 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir) char file_name[MAXFONTFILENAMELEN]; char font_name[MAXFONTNAMELEN]; char dir_file[MAXFONTFILENAMELEN]; -#ifdef FONTDIRATTRIB char dir_path[MAXFONTFILENAMELEN]; char *ptr; -#endif FILE *file; int count, i, @@ -74,7 +72,6 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir) if (strlen(directory) + 1 + sizeof(FontDirFile) > sizeof(dir_file)) return BadFontPath; -#ifdef FONTDIRATTRIB /* Check for font directory attributes */ #if !defined(__UNIXOS2__) && !defined(WIN32) if ((ptr = strchr(directory, ':'))) { @@ -88,9 +85,6 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir) strcpy(dir_path, directory); } strcpy(dir_file, dir_path); -#else - strcpy(dir_file, directory); -#endif if (dir_file[strlen(dir_file) - 1] != '/') strcat(dir_file, "/"); strcat(dir_file, FontDirFile); @@ -147,11 +141,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir) } else if (errno != ENOENT) { return BadFontPath; } -#ifdef FONTDIRATTRIB status = ReadFontAlias(dir_path, FALSE, &dir); -#else - status = ReadFontAlias(directory, FALSE, &dir); -#endif if (status != Successful) { if (dir) FontFileFreeDir (dir); |