summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-04 19:46:16 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-01-04 19:46:16 -0800
commit9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528 (patch)
treeababd090314ff0bc1e7d5725f793e80e0f49038f
parent5d0ae34fb30ae1e4795f93561235fd2c72f0cc47 (diff)
unifdef -U__UNIXOS2__
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/LocBitmap.c8
-rw-r--r--src/RdBitF.c9
2 files changed, 0 insertions, 17 deletions
diff --git a/src/LocBitmap.c b/src/LocBitmap.c
index b587de7..1d8b198 100644
--- a/src/LocBitmap.c
+++ b/src/LocBitmap.c
@@ -156,12 +156,7 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
switch (i) {
case 1:
-#ifndef __UNIXOS2__
if (!(name[0] == '/' || ((name[0] == '.') && name[1] == '/')))
-#else
- if (!(name[0] == '/' || (name[0] == '.' && name[1] == '/') ||
- (isalpha(name[0]) && name[1] == ':')))
-#endif
continue;
fn = (char *) name;
try_plain_name = False;
@@ -186,9 +181,6 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
data = NULL;
pixmap = None;
-#ifdef __UNIXOS2__
- fn = (char*)__XOS2RedirRoot(fn);
-#endif
if (XmuReadBitmapDataFromFile (fn, &width, &height, &data,
&xhot, &yhot) == BitmapSuccess) {
pixmap = XCreatePixmapFromBitmapData (dpy, root, (char *) data,
diff --git a/src/RdBitF.c b/src/RdBitF.c
index 899113b..02159c6 100644
--- a/src/RdBitF.c
+++ b/src/RdBitF.c
@@ -303,10 +303,6 @@ AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
/* try the places set in the environment */
drive = getenv ("_XBASEDRIVE");
-#ifdef __UNIXOS2__
- if (!drive)
- drive = getenv ("X11ROOT");
-#endif
if (!drive)
drive = "C:";
len = strlen (drive) + strlen (path);
@@ -319,7 +315,6 @@ AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
return 1;
}
-#ifndef __UNIXOS2__
/* one last place to look */
drive = getenv ("HOMEDRIVE");
if (drive) {
@@ -354,7 +349,6 @@ AccessFile(char *path, char *pathbuf, int len_pathbuf, char **pathret)
}
}
}
-#endif
return 0;
}
@@ -389,9 +383,6 @@ XmuReadBitmapDataFromFile(_Xconst char *filename, unsigned int *width,
FILE *fstream;
int status;
-#ifdef __UNIXOS2__
- filename = __XOS2RedirRoot(filename);
-#endif
if ((fstream = fopen_file (filename, "r")) == NULL) {
return BitmapOpenFailed;
}