Drop OS/2 support

10 files changed, 9 insertions, 27 deletions

diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 3aa7598..a1b1796 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -217,14 +217,6 @@ _fs_add_rep_log (FSFpePtr conn, fsGenericReply *rep)
 static Bool
 fs_name_check(char *name)
 {
-#ifdef __UNIXOS2__
-    /* OS/2 uses D:/usr/X11R6/.... as fontfile pathnames, so check that
-     * there is not only a protocol/ prefix, but also that the first chars
-     * are not a drive letter
-     */
-    if (name && isalpha(*name) && name[1] == ':')
-      return FALSE;
-#endif
     /* Just make sure there is a protocol/ prefix */
     return (name && *name != '/' && strchr(name, '/'));
 }
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index cbb1a67..ee93378 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -64,9 +64,6 @@
 #define EINTR WSAEINTR
 #endif
 
-#ifdef __UNIXOS2__
-#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t)
-#endif
 
 
 static int  padlength[4] = {0, 3, 2, 1};
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h
index acc1f16..65c440c 100644
--- a/src/fc/fslibos.h
+++ b/src/fc/fslibos.h
@@ -64,7 +64,7 @@ from The Open Group.
 # endif
 #endif
 #ifndef OPEN_MAX
-#if defined(SVR4) || defined(__UNIXOS2__)
+#if defined(SVR4) 
 #define OPEN_MAX 256
 #else
 #include <sys/param.h>
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index 9eb00bc..dd8d6e2 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -125,7 +125,7 @@ BufFileRawClose (BufFilePtr f, int doClose)
 BufFilePtr
 BufFileOpenRead (int fd)
 {
-#if defined(__UNIXOS2__) || defined (WIN32)
+#if defined (WIN32)
     /* hv: I'd bet WIN32 has the same effect here */
     setmode(fd,O_BINARY);
 #endif
@@ -160,7 +160,7 @@ BufFileOpenWrite (int fd)
 {
     BufFilePtr	f;
 
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
     /* hv: I'd bet WIN32 has the same effect here */
     setmode(fd,O_BINARY);
 #endif
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';
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index 3733148..3e2f98a 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -57,12 +57,7 @@ FontFileOpen (const char *name)
 	return 0;
     }
     len = strlen (name);
-#ifndef __UNIXOS2__
     if (len > 2 && !strcmp (name + len - 2, ".Z")) {
-#else
-    if (len > 2 && (!strcmp (name + len - 4, ".pcz") || 
-		    !strcmp (name + len - 2, ".Z"))) {
-#endif
 	cooked = BufFilePushCompressed (raw);
 	if (!cooked) {
 	    BufFileClose (raw, TRUE);
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index d076f16..f9c53a2 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -42,7 +42,7 @@ FontFileOpenWrite (const char *name)
 {
     int	fd;
 
-#if defined(WIN32) || defined(__UNIXOS2__) || defined(__CYGWIN__)
+#if defined(WIN32) || defined(__CYGWIN__)
     fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
 #else
     fd = creat (name, 0666);
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 4d1baa9..73ad317 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -118,7 +118,7 @@ FontFileMakeDir(char *dirName, int size)
     char		*attrib;
     int			attriblen;
 
-#if !defined(__UNIXOS2__) && !defined(WIN32)
+#if !defined(WIN32)
     attrib = strchr(dirName, ':');
 #else
     /* OS/2 uses the colon in the drive letter descriptor, skip this */
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index d502569..09fc555 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -55,7 +55,7 @@ int
 FontFileNameCheck (char *name)
 {
 #ifndef NCD
-#if defined(__UNIXOS2__) || defined(WIN32)
+#if defined(WIN32)
     /* OS/2 uses D:/... as a path name for fonts, so accept this as a valid
      * path if it starts with a letter and a colon. Same applies for WIN32
      */
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 7adf74f..4625540 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -202,7 +202,6 @@ xlfd_round_double(double x)
     defined(__hppa__) || \
     defined(__amd64__) || defined(__amd64) || \
     defined(sgi)
-#if !defined(__UNIXOS2__)
 #include <float.h>
 
 /* if we have IEEE 754 fp, we can round to binary digits... */
@@ -263,7 +262,6 @@ xlfd_round_double(double x)
    }
    else
 #endif
-#endif /* !__UNIXOS2__ */
 #endif /* i386 || __i386__ */
     {
 	/*