libXmu: Branch 'master' - 2 commits

[Alan Coopersmith]

 src/CvtStdSel.c |   18 +++---------------
 src/LocBitmap.c |    8 --------
 src/RdBitF.c    |    9 ---------
 3 files changed, 3 insertions(+), 32 deletions(-)

New commits:
commit 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Jan 4 19:46:16 2013 -0800

    unifdef -U__UNIXOS2__
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

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;
     }
commit 5d0ae34fb30ae1e4795f93561235fd2c72f0cc47
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Wed Dec 26 23:32:03 2012 -0800

    Remove unused DECnet ("DNETCONN") code from XmuConvertStandardSelection
    
    Has never been converted to build in modular builds, so has been unusable
    since X11R7.0 release in 2005.  DNETCONN support was removed from xtrans
    back in 2008.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/CvtStdSel.c b/src/CvtStdSel.c
index 141dfe8..36423c6 100644
--- a/src/CvtStdSel.c
+++ b/src/CvtStdSel.c
@@ -242,11 +242,6 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target,
 	return True;
     }
 #endif
-#ifdef DNETCONN
-    if (*target == XA_DECNET_ADDRESS(d)) {
-	return False;		/* XXX niy */
-    }
-#endif
     if (*target == XA_USER(d)) {
 	char *name = (char*)getenv("USER");
 	if (name == NULL) return False;
@@ -312,14 +307,10 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target,
 	return True;
     }
     if (*target == XA_TARGETS(d)) {
-#if defined(unix) && defined(DNETCONN)
-#  define NUM_TARGETS 9
+#if defined(unix)
+#  define NUM_TARGETS 8
 #else
-#  if defined(unix) || defined(DNETCONN)
-#    define NUM_TARGETS 8
-#  else
-#    define NUM_TARGETS 7
-#  endif
+#  define NUM_TARGETS 7
 #endif
 	Atom* std_targets = (Atom*)XtMalloc(NUM_TARGETS*sizeof(Atom));
 	int i = 0;
@@ -333,9 +324,6 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target,
 #ifdef unix
 	std_targets[i++] = XA_OWNER_OS(d);
 #endif
-#ifdef DNETCONN
-	std_targets[i++] = XA_DECNET_ADDRESS(d);
-#endif
 	*value = (XPointer)std_targets;
 	*type = XA_ATOM;
 	*length = NUM_TARGETS;