Merge lp:~vanvugt/mir/fix-1626866 into lp:mir

[Daniel van Vugt]

Fix a couple of recent mistakes that are making 'make abi-check' fail
to build:
  * Missing header guard (LP: #1626866)
  * Include paths no longer exist (they moved but seemingly also unused)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3714
https://mir-jenkins.ubuntu.com/job/mir-ci/1800/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2250
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2313
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2304
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2278/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2278
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2278/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1800/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Opps lgtm, thanks!

review: Approve

=== modified file 'include/platform/mir/graphics/gamma_curves.h'
--- include/platform/mir/graphics/gamma_curves.h	2016-09-19 04:16:15 +0000
+++ include/platform/mir/graphics/gamma_curves.h	2016-09-23 07:45:46 +0000
@@ -16,6 +16,9 @@
  * Authored by: Brandon Schaefer <[e-mail]>
  */
 
+#ifndef MIR_GRAPHICS_GAMMA_CURVES_H_
+#define MIR_GRAPHICS_GAMMA_CURVES_H_
+
 #include <cstdint>
 #include <vector>
 
@@ -40,3 +43,5 @@
 
 }
 }
+
+#endif

=== modified file 'src/platforms/android/server/CMakeLists.txt'
--- src/platforms/android/server/CMakeLists.txt	2016-08-16 19:34:28 +0000
+++ src/platforms/android/server/CMakeLists.txt	2016-09-23 07:45:46 +0000
@@ -1,6 +1,5 @@
 include_directories(
     ${PROJECT_SOURCE_DIR}/src/include/gl
-    ${PROJECT_SOURCE_DIR}/src/include/sw
 )
 
 include_directories(

=== modified file 'src/platforms/mesa/CMakeLists.txt'
--- src/platforms/mesa/CMakeLists.txt	2016-08-02 18:30:00 +0000
+++ src/platforms/mesa/CMakeLists.txt	2016-09-23 07:45:46 +0000
@@ -8,7 +8,6 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/include/platforms/mesa
-  ${PROJECT_SOURCE_DIR}/src/platforms/common/kms-utils/
   ${PROJECT_SOURCE_DIR}/src/platforms/mesa/include/
 )