xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 18935b41e13b34571ffda84bde5257b8e84e6d1f
Author: Keith Packard <keithp at keithp.com>
Date:   Sat Sep 20 04:04:43 2014 -0700

    XSERVER_DTRACE needs request names from registry too
    
    The dtrace code in the server wants to log the name of each executed
    request, which it gets from the registry. Use that as an additional
    indication of when that portion of the registry should be included in
    the server build.
    
    See:
    
    http://tinderbox.x.org/builds/2014-09-19-0003/logs/xserver/#build
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Dave Airlie <airlied at gmail.com>

diff --git a/include/registry.h b/include/registry.h
index 43c3db3..f50fa76 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define X_REGISTRY_RESOURCE       1
 #endif
 
-#if defined(XSELINUX) || defined(XCSECURITY)
+#if defined(XSELINUX) || defined(XCSECURITY) || defined(XSERVER_DTRACE)
 #define X_REGISTRY_REQUEST        1
 #endif