[X2Go-Commits] [nx-libs] 02/02: Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit e7b7445251c120a0a1d3b1f1f9ad10b8dc8915d3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 16 14:50:12 2017 +0100

    Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for.
---
 nx-X11/programs/Xserver/Xext/xvdisp.c  | 2 +-
 nx-X11/programs/Xserver/include/misc.h | 6 ------
 nx-X11/programs/Xserver/mi/miinitext.c | 2 +-
 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 6f3e372..5f65c3f 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 f32f86e..27137cd 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 15466ee..f40ea8a 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git