xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/common/xf86Priv.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 147ed28bbf78f6b75a22b21458785aea536e44f8
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Wed Apr 3 13:11:14 2019 -0700

    xfree86: Export xf86GPUScreens and xf86NumGPUScreens
    
    Drivers may need to loop over the allocated screens during PreInit, for example
    to consolidate xorg.conf options that apply to a GPU device as a whole.
    Currently, this works for protocol screens becuase x86Screens is exported, but
    does not work for GPU screens.
    
    Export xf86GPUScreens and xf86NumGPUScreens for consistency with xf86Screens and
    xf86NumScreens.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 857a92473..091c8bb2f 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -89,8 +89,8 @@ extern _X_EXPORT const char *xf86VisualNames[];
 extern _X_EXPORT int xf86Verbose;       /* verbosity level */
 extern _X_EXPORT int xf86LogVerbose;    /* log file verbosity level */
 
-extern ScrnInfoPtr *xf86GPUScreens;      /* List of pointers to ScrnInfoRecs */
-extern int xf86NumGPUScreens;
+extern _X_EXPORT ScrnInfoPtr *xf86GPUScreens;      /* List of pointers to ScrnInfoRecs */
+extern _X_EXPORT int xf86NumGPUScreens;
 extern _X_EXPORT int xf86DRMMasterFd;              /* Command line argument for DRM master file descriptor */
 #ifndef DEFAULT_VERBOSE
 #define DEFAULT_VERBOSE		0