drm: Branch 'master' - 2 commits

 meson.build  |    8 ++++----
 xf86atomic.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8177d73bdb12eedfa85da35fad6882afb2b01288
Author: Eric Engestrom <[email protected]>
Date:   Fri Jan 26 11:18:30 2018 +0000

    meson: cleanup whitespace
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>

diff --git a/meson.build b/meson.build
index 65366eee..e05db1cd 100644
--- a/meson.build
+++ b/meson.build
@@ -207,8 +207,8 @@ foreach a : ['-Wall', '-Wextra', '-Wsign-compare',
              '-Werror-implicit-function-declaration', '-Wpointer-arith',
              '-Wwrite-strings', '-Wstrict-prototypes', '-Wmissing-prototypes',
              '-Wmissing-declarations', '-Wnested-externs', '-Wpacked',
-             '-Wswitch-enum', '-Wmissing-format-attribute', 
-             '-Wstrict-aliasing=2', '-Winit-self', '-Winline', '-Wshadow', 
+             '-Wswitch-enum', '-Wmissing-format-attribute',
+             '-Wstrict-aliasing=2', '-Winit-self', '-Winline', '-Wshadow',
              '-Wdeclaration-after-statement', '-Wold-style-definition']
   if cc.has_argument(a)
     warn_c_args += a
@@ -216,7 +216,7 @@ foreach a : ['-Wall', '-Wextra', '-Wsign-compare',
 endforeach
 # GCC will never error for -Wno-*, so check for -W* then add -Wno-* to the list
 # of options
-foreach a : ['unused-parameter', 'attributes', 'long-long', 
+foreach a : ['unused-parameter', 'attributes', 'long-long',
              'missing-field-initializers']
   if cc.has_argument('-W@0@'.format(a))
     warn_c_args += '-Wno-@0@'.format(a)
@@ -320,7 +320,7 @@ pkg.generate(
   version : meson.project_version(),
   description : 'Userspace interface to kernel DRM services',
 )
- 
+
 if with_libkms
   subdir('libkms')
 endif
commit 2d50a404f6b00117b477766ccd078973933aedc3
Author: Eric Engestrom <[email protected]>
Date:   Fri Jan 26 15:10:46 2018 +0000

    xf86atomic: fix -Wundef warning
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>
    Reviewed-by: Dylan Baker <[email protected]>

diff --git a/xf86atomic.h b/xf86atomic.h
index 922b37da..70e91866 100644
--- a/xf86atomic.h
+++ b/xf86atomic.h
@@ -101,7 +101,7 @@ typedef struct { LIBDRM_ATOMIC_TYPE atomic; } atomic_t;
 
 #endif
 
-#if ! HAS_ATOMIC_OPS
+#if !defined(HAS_ATOMIC_OPS)
 #error libdrm requires atomic operations, please define them for your CPU/compiler.
 #endif
 

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--