aboutsummaryrefslogtreecommitdiff
path: root/libXmu/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
committermarha <marha@users.sourceforge.net>2013-01-14 15:26:50 +0100
commitc67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch)
treec197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /libXmu/src
parent8d07c58314685d56a0586d0a437b541ea2b92a54 (diff)
parent2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff)
downloadvcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2
vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013 Conflicts: mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'libXmu/src')
-rw-r--r--libXmu/src/CvtStdSel.c18
-rw-r--r--libXmu/src/LocBitmap.c8
-rw-r--r--libXmu/src/RdBitF.c9
3 files changed, 3 insertions, 32 deletions
diff --git a/libXmu/src/CvtStdSel.c b/libXmu/src/CvtStdSel.c
index 141dfe8df..36423c6fa 100644
--- a/libXmu/src/CvtStdSel.c
+++ b/libXmu/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;
diff --git a/libXmu/src/LocBitmap.c b/libXmu/src/LocBitmap.c
index b587de7be..1d8b19828 100644
--- a/libXmu/src/LocBitmap.c
+++ b/libXmu/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/libXmu/src/RdBitF.c b/libXmu/src/RdBitF.c
index ea447c3c8..58b90a8aa 100644
--- a/libXmu/src/RdBitF.c
+++ b/libXmu/src/RdBitF.c
@@ -303,10 +303,6 @@ AccessFile(_Xconst 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(_Xconst 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(_Xconst 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;
}