commit daba227da64b488a264417708e91e285aeb2fa54
author Peter Åstrand (astrand) <astrand@cendio.se> Mon Oct 09 12:32:14 2017 +0200
committer Peter Åstrand (astrand) <astrand@cendio.se> Tue Nov 07 11:05:10 2017 +0100
tree c69b9ebcd6eb8ea5c780b5aee74dfe5c2691aedc
parent e04ad71ca2cbf2f4dfbce35526dd640efe87975e

Build with support for MIT-SHM

No need for ifdefs; we can assume MITSHM. Already done in vncviewer.

unix/x0vncserver/Image.cxx

diff --git a/unix/x0vncserver/Image.cxx b/unix/x0vncserver/Image.cxx
index f998c6a..7bb2328 100644
--- a/unix/x0vncserver/Image.cxx
+++ b/unix/x0vncserver/Image.cxx
@@ -24,10 +24,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
-#ifdef HAVE_MITSHM
 #include <sys/ipc.h>
 #include <sys/shm.h>
-#endif
 
 #include <rfb/LogWriter.h>
 #include <x0vncserver/Image.h>
@@ -196,8 +194,6 @@
   updateRect(src->xim, dst_x, dst_y, src_x, src_y, w, h);
 }
 
-#ifdef HAVE_MITSHM
-
 //
 // ShmImage class implementation.
 //
@@ -429,7 +425,6 @@
 }
 
 #endif // HAVE_READDISPLAY
-#endif // HAVE_MITSHM
 
 #ifdef HAVE_SUN_OVL
 
@@ -490,7 +485,7 @@
 //
 
 // Prepare useful shortcuts for compile-time options.
-#if defined(HAVE_READDISPLAY) && defined(HAVE_MITSHM)
+#if defined(HAVE_READDISPLAY)
 #define HAVE_SHM_READDISPLAY
 #endif
 #if defined(HAVE_SHM_READDISPLAY) || defined(HAVE_SUN_OVL)
@@ -536,7 +531,6 @@
 
   // Now, try to use shared memory image.
 
-#ifdef HAVE_MITSHM
   if (mayUseShm) {
     image = new ShmImage(d, width, height);
     if (image->xim != NULL) {
@@ -546,7 +540,6 @@
     delete image;
     vlog.error("Failed to create SHM image, falling back to Xlib image");
   }
-#endif // HAVE_MITSHM
 
   // Fall back to Xlib image.