From 269651e47d6f5b1e107f818a125c4812df59ce5e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Feb 2017 23:23:52 +0000 Subject: Xserver/fb/fboverlay.c: Define -DMITSHM at build as it is used in fboverlay.c. Fixes ArcticaProject/nx-libs#237. --- nx-X11/programs/Xserver/fb/Imakefile | 5 +++++ nx-X11/programs/Xserver/fb/fboverlay.c | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index e1dadfdf3..5daa10c6f 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -6,6 +6,9 @@ NULL = FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT #endif +#if HasShm +SHM_DEFINES = ShmDefines +#endif #if BuildRender RENDERSRC = fbcompose.c @@ -116,6 +119,8 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif +SpecialCObjectRule(fboverlay,$(ICONFIGFILES),$(SHM_DEFINES)) + #ifdef LinkDirectory LinkSourceFile(fb24_32.c,LinkDirectory) LinkSourceFile(fballpriv.c,LinkDirectory) diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c index 71a7f30d2..e51f922f5 100644 --- a/nx-X11/programs/Xserver/fb/fboverlay.c +++ b/nx-X11/programs/Xserver/fb/fboverlay.c @@ -32,6 +32,10 @@ #include "fb.h" #include "fboverlay.h" +#ifdef MITSHM +#include "shmint.h" +#endif + int fbOverlayGeneration; int fbOverlayScreenPrivateIndex = -1; -- cgit v1.2.3