Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually…

Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for.

Drop SHMNAME workaround again, it is defined in shmstr.h, which is actually…
e7b74452 · Mihai Moldovan · 1e2fc154 · e7b74452 · e7b74452 · e7b74452
Commit e7b74452 authored Dec 16, 2017 by Mihai Moldovan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

xvdisp.c nx-X11/programs/Xserver/Xext/xvdisp.c +1 -1

misc.h nx-X11/programs/Xserver/include/misc.h +0 -6

miinitext.c nx-X11/programs/Xserver/mi/miinitext.c +1 -1

No files found.
--- 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

--- 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 */
--- 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