summaryrefslogtreecommitdiff
path: root/src/fontfile/dirfile.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-01-20 23:17:55 -0500
committerAdam Jackson <ajax@redhat.com>2009-01-20 23:17:55 -0500
commit6c29007756301f513c0151e2b63af073f310af66 (patch)
tree101a4f3b1e20416922b546fa25c778fe5387835a /src/fontfile/dirfile.c
parent0cdc9b8f850342d50b72a57507db3413eacc6fb8 (diff)
Drop OS/2 support
Diffstat (limited to 'src/fontfile/dirfile.c')
-rw-r--r--[-rwxr-xr-x]src/fontfile/dirfile.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 40692c8..588464f 100755..100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -66,7 +66,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
status;
struct stat statb;
static char format[24] = "";
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
int i;
#endif
@@ -76,7 +76,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
return BadFontPath;
/* Check for font directory attributes */
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
if ((ptr = strchr(directory, ':'))) {
#else
/* OS/2 and WIN32 path might start with a drive letter, don't clip this */
@@ -118,7 +118,7 @@ FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
MAXFONTFILENAMELEN-1, MAXFONTNAMELEN-1);
while ((count = fscanf(file, format, file_name, font_name)) != EOF) {
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
/* strip any existing trailing CR */
for (i=0; i<strlen(font_name); i++) {
if (font_name[i]=='\r') font_name[i] = '\0';