xserver: Branch 'master'

[Adam Jackson]

 os/timingsafe_memcmp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9dbecf7c259f7e8b610fa93f97ea55f5dafa7af
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed May 10 10:56:16 2017 -0400

    timingsafe_memcmp: Fix meson build
    
    Include dix-config.h first to pick up _GNU_SOURCE so we get the
    definition for sigset_t.
    
    Reported-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/os/timingsafe_memcmp.c b/os/timingsafe_memcmp.c
index 65679c87a..4eaba627e 100644
--- a/os/timingsafe_memcmp.c
+++ b/os/timingsafe_memcmp.c
@@ -14,10 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <dix-config.h>
 #include <limits.h>
 #include <string.h>
 #include <X11/Xfuncproto.h>
-#include <dix-config.h>
 #include "os.h"
 
 int