winex11: Get rid of xrandr.h.
This commit is contained in:
parent
eafc8d0b34
commit
6c4465f4ac
|
@ -664,6 +664,7 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name,
|
|||
|
||||
void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
|
||||
void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
|
||||
void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN;
|
||||
|
||||
/* XIM support */
|
||||
extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;
|
||||
|
|
|
@ -47,7 +47,6 @@
|
|||
#include "winreg.h"
|
||||
|
||||
#include "x11drv.h"
|
||||
#include "xrandr.h"
|
||||
#include "xcomposite.h"
|
||||
#include "wine/server.h"
|
||||
#include "wine/debug.h"
|
||||
|
@ -576,10 +575,8 @@ static BOOL process_attach(void)
|
|||
|
||||
/* initialize XVidMode */
|
||||
X11DRV_XF86VM_Init();
|
||||
#ifdef SONAME_LIBXRANDR
|
||||
/* initialize XRandR */
|
||||
X11DRV_XRandR_Init();
|
||||
#endif
|
||||
#ifdef SONAME_LIBXCOMPOSITE
|
||||
X11DRV_XComposite_Init();
|
||||
#endif
|
||||
|
|
|
@ -20,24 +20,22 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "wine/port.h"
|
||||
#include "wine/debug.h"
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(xrandr);
|
||||
|
||||
#ifdef SONAME_LIBXRANDR
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
#include "x11drv.h"
|
||||
|
||||
#include "xrandr.h"
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "wingdi.h"
|
||||
#include "wine/library.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(xrandr);
|
||||
|
||||
static void *xrandr_handle;
|
||||
|
||||
|
@ -299,4 +297,11 @@ void X11DRV_XRandR_Init(void)
|
|||
TRACE("Enabling XRandR\n");
|
||||
}
|
||||
|
||||
#else /* SONAME_LIBXRANDR */
|
||||
|
||||
void X11DRV_XRandR_Init(void)
|
||||
{
|
||||
TRACE("XRandR support not compiled in.\n");
|
||||
}
|
||||
|
||||
#endif /* SONAME_LIBXRANDR */
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
/*
|
||||
* Wine X11drv Xrandr interface
|
||||
*
|
||||
* Copyright 2003 Alexander James Pasadyn
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
#ifndef __WINE_XRANDR_H
|
||||
#define __WINE_XRANDR_H
|
||||
|
||||
#ifndef __WINE_CONFIG_H
|
||||
# error You must include config.h to use this header
|
||||
#endif
|
||||
|
||||
#ifdef SONAME_LIBXRANDR
|
||||
|
||||
void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN;
|
||||
|
||||
#endif /* SONAME_LIBXRANDR */
|
||||
#endif /* __WINE_XRANDR_H */
|
Loading…
Reference in New Issue