aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-16 14:50:12 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-16 14:54:19 +0100
commite7b7445251c120a0a1d3b1f1f9ad10b8dc8915d3 (patch)
tree090426fbbd0229a06ccbad0c95c429843d233bad /nx-X11
parent1e2fc15483d795ffe36f78d802c3d67ef585894c (diff)
downloadnx-libs-e7b7445251c120a0a1d3b1f1f9ad10b8dc8915d3.tar.gz
nx-libs-e7b7445251c120a0a1d3b1f1f9ad10b8dc8915d3.tar.bz2
nx-libs-e7b7445251c120a0a1d3b1f1f9ad10b8dc8915d3.zip
Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/Xext/xvdisp.c2
-rw-r--r--nx-X11/programs/Xserver/include/misc.h6
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c2
3 files changed, 2 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c
index 6f3e3729d..5f65c3fcd 100644
--- a/nx-X11/programs/Xserver/Xext/xvdisp.c
+++ b/nx-X11/programs/Xserver/Xext/xvdisp.c
@@ -69,7 +69,7 @@ SOFTWARE.
#ifdef MITSHM
#define _XSHM_SERVER_
#ifdef LEGACY_XEXT_PROTO
-#include <X11/extensions/XShm.h>
+#include <X11/extensions/shmstr.h>
#else
#include <X11/extensions/shmproto.h>
#endif
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index f32f86e41..27137cd50 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -397,10 +397,4 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
#define _XTYPEDEF_CHARINFOPTR
#endif
-#ifdef LEGACY_XEXT_PROTO
-#ifndef SHMNAME
-#define SHMNAME "MIT-SHM"
-#endif
-#endif
-
#endif /* MISC_H */
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index 15466eea5..f40ea8a8e 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -148,7 +148,7 @@ typedef void (*InitExtension)(void);
#ifdef MITSHM
#define _XSHM_SERVER_
#ifdef LEGACY_XEXT_PROTO
-#include <X11/extensions/XShm.h>
+#include <X11/extensions/shmstr.h>
#else
#include <X11/extensions/shmproto.h>
#endif