This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository nx-libs. from 3abdb99 nx-X11/programs/Xserver/Xext/shape.c: pull in shapestr.h for legacy Xext proto versions, since shape.h would pull in Xlib. new 1e2fc15 nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro. new e7b7445 Drop SHMNAME workaround again, it *is* defined in shmstr.h, which is actually header I was searching for. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/Xext/shape.c | 7 +++++++ nx-X11/programs/Xserver/Xext/xvdisp.c | 2 +- nx-X11/programs/Xserver/include/misc.h | 6 ------ nx-X11/programs/Xserver/mi/miinitext.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository nx-libs. commit 1e2fc15483d795ffe36f78d802c3d67ef585894c Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 16 14:45:46 2017 +0100 nx-X11/programs/Xserver/Xext/shape.c: avoid pulling in Xlib in legacy mode via the _SHAPE_SERVER_ macro. --- nx-X11/programs/Xserver/Xext/shape.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 505a261..693495b 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -42,6 +42,13 @@ in this Software without prior written authorization from The Open Group. #include "resource.h" #include "opaque.h" #ifdef LEGACY_XEXT_PROTO +/* + * The legacy shape proto implementation used to distinguish between + * the server and client side via the _SHAPE_SERVER_ macro. + * If not set, shape.h pulls in Xlib, which will lead to compile + * errors in a server environment. + */ +#define _SHAPE_SERVER_ #include <X11/extensions/shapestr.h> #else #include <X11/extensions/shapeproto.h> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
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@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
-
git-admin＠x2go.org