summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2014-12-15 10:52:43 +0100
committerPierre Ossman <ossman@cendio.se>2014-12-15 10:52:43 +0100
commit2b76d028b0253be7c4496840fcd2e0fb47c0794e (patch)
treea07f88bb4dc0d960b9356f5018431d90ca04b1b7
parent7614a12315b2fd7fe6a744fa98adb67c28c64c39 (diff)
downloadtigervnc-2b76d028b0253be7c4496840fcd2e0fb47c0794e.tar.gz
tigervnc-2b76d028b0253be7c4496840fcd2e0fb47c0794e.zip
Band aid to work around inluding C headers in C++ code
-rw-r--r--unix/xserver/hw/vnc/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index 9885b8a3..372a57f5 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -7,6 +7,9 @@ NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
+# Hack to get the C headers to work when included from C++ code
+AM_CXXFLAGS = -fpermissive
+
noinst_LTLIBRARIES = libvnccommon.la
HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \