xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 include/dix.h     |    3 ---
 include/dixfont.h |    1 -
 2 files changed, 4 deletions(-)

New commits:
commit 3297a1c871a25647d9d08b5f528e640cc2a1d2c2
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 24 16:30:40 2018 -0400

    include: Remove ___CLIENTSIGNALALL_DEFINED___ copypasta
    
    ___CLIENTSIGNAL_DEFINED___ is a hack to work around the declaration of
    ClientSignal both in our own headers and in <X11/include/fontproto.h>,
    the latter of which is properly part of libXfont (1, only) but packaged
    in xorgproto because we have made some mistakes. ClientSignalAll needs
    no such workaround.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/include/dix.h b/include/dix.h
index 476559842..cf263a1f5 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -261,13 +261,10 @@ extern _X_EXPORT Bool ClientSleep(ClientPtr client,
 extern _X_EXPORT Bool ClientSignal(ClientPtr /*client */ );
 #endif                          /* ___CLIENTSIGNAL_DEFINED___ */
 
-#ifndef ___CLIENTSIGNALALL_DEFINED___
-#define ___CLIENTSIGNALALL_DEFINED___
 #define CLIENT_SIGNAL_ANY ((void *)-1)
 extern _X_EXPORT int ClientSignalAll(ClientPtr /*client*/,
                                      ClientSleepProcPtr /*function*/,
                                      void * /*closure*/);
-#endif                          /* ___CLIENTSIGNALALL_DEFINED___ */
 
 extern _X_EXPORT void ClientWakeup(ClientPtr /*client */ );
 
commit 06f448d4af905412b1e0b4074f7763ec85f2b6e8
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Oct 24 16:23:04 2018 -0400

    include: Stop including <X11/fonts/fontproto.h>
    
    Despite being packaged in xorgproto (formerly fontsproto), fontproto.h
    is actually a list of the ABI libXfont version 1 expected of the X
    server. We switched to libXfont2 three years ago, this is unnecessary.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/include/dixfont.h b/include/dixfont.h
index 3a38d10c5..65b5d2075 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -28,7 +28,6 @@ SOFTWARE.
 #include <X11/fonts/font.h>
 #include "closure.h"
 #include <X11/fonts/fontstruct.h>
-#include <X11/fonts/fontproto.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)