aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-05 23:23:52 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 15:35:07 +0100
commit269651e47d6f5b1e107f818a125c4812df59ce5e (patch)
tree9346c291aafb706d436295fe4461cdf0d06a3d45
parentdbfd7645a88c8a25c24a6d675377cab24b37682a (diff)
downloadnx-libs-269651e47d6f5b1e107f818a125c4812df59ce5e.tar.gz
nx-libs-269651e47d6f5b1e107f818a125c4812df59ce5e.tar.bz2
nx-libs-269651e47d6f5b1e107f818a125c4812df59ce5e.zip
Xserver/fb/fboverlay.c: Define -DMITSHM at build as it is used in fboverlay.c.
Fixes ArcticaProject/nx-libs#237.
-rw-r--r--nx-X11/programs/Xserver/fb/Imakefile5
-rw-r--r--nx-X11/programs/Xserver/fb/fboverlay.c4
2 files changed, 9 insertions, 0 deletions
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;