xserver: Branch 'master'

[Adam Jackson]

 os/timingsafe_memcmp.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5c44169caed811e59a65ba346de1cadb46d266ec
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 2 17:20:30 2017 -0500

    os: Squash missing declaration warning for timingsafe_memcmp
    
    timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes]
     timingsafe_memcmp(const void *b1, const void *b2, size_t len)
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/os/timingsafe_memcmp.c b/os/timingsafe_memcmp.c
index 36ab362..65679c8 100644
--- a/os/timingsafe_memcmp.c
+++ b/os/timingsafe_memcmp.c
@@ -16,6 +16,9 @@
 
 #include <limits.h>
 #include <string.h>
+#include <X11/Xfuncproto.h>
+#include <dix-config.h>
+#include "os.h"
 
 int
 timingsafe_memcmp(const void *b1, const void *b2, size_t len)