xserver: Branch 'master'

[Keith Packard]

 include/resource.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c74c074d8e4981eb4509e120e14d15387bdc94ef
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Mon Aug 31 08:18:59 2015 +0200

    dix: export ResourceClientBits()
    
    ResourceClientBits() might be used by the modules as well, need to
    mark the symbol as visible to that the linker can resolve it at
    run time.
    
    /usr/bin/X: symbol lookup error:
    /usr/lib64/xorg/modules/extensions/libglx.so: undefined symbol:
    ResourceClientBits
    
    bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91763
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/resource.h b/include/resource.h
index 597f7b6..5871a4c 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -85,7 +85,7 @@ typedef uint32_t RESTYPE;
 #define RT_LASTPREDEF	((RESTYPE)9)
 #define RT_NONE		((RESTYPE)0)
 
-extern unsigned int ResourceClientBits(void);
+extern _X_EXPORT unsigned int ResourceClientBits(void);
 /* bits and fields within a resource id */
 #define RESOURCE_AND_CLIENT_COUNT   29  /* 29 bits for XIDs */
 #define RESOURCE_CLIENT_BITS        ResourceClientBits() /* client field offset */