Imported Upstream version 1.1.2

[platform/upstream/libXmu.git] / src / LocBitmap.c

diff --git a/src/LocBitmap.c b/src/LocBitmap.c
index b587de7..229d0fd 100644 (file)
--- a/src/LocBitmap.c
+++ b/src/LocBitmap.c
@@ -150,20 +150,15 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
      */
 
     for (i = 1; i <= 4; i++) {
-       char *fn = filename;
+       const char *fn = filename;
        Pixmap pixmap;
        unsigned char *data;
 
        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;
+           fn = name;
            try_plain_name = False;
            break;
          case 2:
@@ -180,15 +175,12 @@ XmuLocatePixmapFile(Screen *screen, _Xconst char *name,
            break;
          case 4:
            if (!try_plain_name) continue;
-           fn = (char *) name;
+           fn = name;
            break;
        }
 
        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,