Skip to content

N
nx-libs
Commit e7b74452 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

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.
parent 1e2fc154
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
nx-X11/programs/Xserver/Xext/xvdisp.c
View file @ e7b74452
...@@ -69,7 +69,7 @@ SOFTWARE. ...@@ -69,7 +69,7 @@ SOFTWARE.
#ifdef MITSHM #ifdef MITSHM
#define _XSHM_SERVER_ #define _XSHM_SERVER_
#ifdef LEGACY_XEXT_PROTO #ifdef LEGACY_XEXT_PROTO
#include <X11/extensions/XShm.h> #include <X11/extensions/shmstr.h>
#else #else
#include <X11/extensions/shmproto.h> #include <X11/extensions/shmproto.h>
#endif #endif
......
nx-X11/programs/Xserver/include/misc.h
View file @ e7b74452
...@@ -397,10 +397,4 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */ ...@@ -397,10 +397,4 @@ typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
#define _XTYPEDEF_CHARINFOPTR #define _XTYPEDEF_CHARINFOPTR
#endif #endif
#ifdef LEGACY_XEXT_PROTO
#ifndef SHMNAME
#define SHMNAME "MIT-SHM"
#endif
#endif
#endif /* MISC_H */ #endif /* MISC_H */
nx-X11/programs/Xserver/mi/miinitext.c
View file @ e7b74452
...@@ -148,7 +148,7 @@ typedef void (*InitExtension)(void); ...@@ -148,7 +148,7 @@ typedef void (*InitExtension)(void);
#ifdef MITSHM #ifdef MITSHM
#define _XSHM_SERVER_ #define _XSHM_SERVER_
#ifdef LEGACY_XEXT_PROTO #ifdef LEGACY_XEXT_PROTO
#include <X11/extensions/XShm.h> #include <X11/extensions/shmstr.h>
#else #else
#include <X11/extensions/shmproto.h> #include <X11/extensions/shmproto.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment