Merge branch 'mjtrangoni-WIP-travis' into 3.6.x

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

4 files changed, 59 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..f8806d063
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,56 @@
+# Use new trusty images, should yield newer compilers and packages
+sudo: true
+dist: trusty
+language: cpp
+
+matrix:
+  include:
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+      env:
+         - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+      env:
+        - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - clang-3.9
+      env:
+        - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - clang-5.0
+      env:
+        - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+
+before_install:
+  - sudo apt-get update -qq
+  # imake
+  - sudo apt-get install -y xutils-dev
+  # X11 libaries
+  - sudo apt-get install -y libxcomposite-dev libxfont-dev libxinerama-dev libxrandr-dev libxtst-dev x11proto-fonts-dev
+  - eval "${MATRIX_EVAL}"
+script:
+  - make
diff --git a/README.md b/README.md
index c96b1fcb9..a46267c69 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# NX development by ArticaProject, X2Go and TheQVD
+# NX development by ArticaProject, X2Go and TheQVD [![Build Status](https://travis-ci.org/ArcticaProject/nx-libs.svg)](https://travis-ci.org/ArcticaProject/nx-libs)
 
 This source tree started as a re-distribution of those NX packages needed
 to setup FreeNX and/or X2Go on a Linux server.
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 5365a99cf..f22053cc6 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3573,7 +3573,7 @@ int SetupAuthInstance()
 
   if (control -> ProxyMode == proxy_server)
   {
-    if (authCookie != NULL && *authCookie != '\0')
+    if (*authCookie != '\0')
     {
       if (useLaunchdSocket == 1)
       {
diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp
index 3031bde37..8c5dbd5f6 100644
--- a/nxcompshad/src/X11.cpp
+++ b/nxcompshad/src/X11.cpp
@@ -363,7 +363,7 @@ void Poller::shmInit(void)
 
     shminfo_ -> shmaddr = (char *)shmat(shminfo_ -> shmid, 0, 0);
 
-    if (shminfo_ -> shmaddr < 0)
+    if (shminfo_ -> shmaddr < (void *)0)
     {
       logWarning("Poller::shmInit", "Couldn't attach to shm segment.");
     }