xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/sdksyms.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0031bbad8400d35699664d18c0d8fc2e9e82d8a7
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 11 15:39:33 2018 -0400

    sdksyms: Skip empty symbols
    
    Apparently on NetBSD we can hit failures like this:
    
    sdksyms.c:1773:15: error: expected expression before ',' token
         (void *) &,                                                  /* ../../dri3/dri3.h:110 */
    
    I've been unable to reproduce that locally (even in a NetBSD vm), but
    an obvious workaround might be to just notice empty symbol names and
    ignore them rather than emit invalid C code.
    
    Tested-by: Thomas Klausner <wiz at netbsd.org>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index d927fcd16..fc171d918 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -415,7 +415,8 @@ BEGIN {
 	sub(/[^a-zA-Z0-9_].*/, "", symbol);
 
 	#print;
-	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
+	if (symbol != "")
+	    printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
     }
 }