Merge branch 'uli42-pr/fix_region_crash' into 3.6.x

Attributes GH PR #927: https://github.com/ArcticaProject/nx-libs/pull/927

Merge branch 'uli42-pr/fix_region_crash' into 3.6.x
4904bfe1 · Mike Gabriel · bdc698b7 · 6f22fb9e · 4904bfe1
Unverified Commit 4904bfe1 authored May 30, 2020 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Imakefile nx-X11/programs/Xserver/mi/Imakefile +4 -1

No files found.
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -123,6 +123,9 @@ OBJS =  $(CBRT_OBJ)             \

 #if NXLibraries

+NX_DEFINES = -DNXAGENT_SERVER  \
+             $(NULL)
+
 /*
 * To build the NX agent we need the XINPUT symbol
 * in order to build the XInputExtension, since we
@@ -155,7 +158,7 @@ LINTLIBS =                      \
           ../os/llib-los.ln    \
           $(NULL)

-DEFINES  = $(FFS_DEFINES)
+DEFINES  = $(FFS_DEFINES) $(NX_DEFINES)

 NormalLibraryObjectRule()
 NormalLibraryTarget(mi,$(OBJS))