Henri Verbeet : winex11: Get rid of xvidmode.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eafc8d0b3440dc842dc50822aa6d4a49f8662d15
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eafc8d0b3440dc842dc50822aa...

Author: Henri Verbeet 
Date:   Sun Jul  8 16:06:38 2012 +0200

winex11: Get rid of xvidmode.h.

---

dlls/winex11.drv/x11drv.h      |    3 +++
 dlls/winex11.drv/x11drv_main.c |    5 -----
 dlls/winex11.drv/xvidmode.c    |   13 +++++++++++--
 dlls/winex11.drv/xvidmode.h    |   37 -------------------------------------
 4 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 0bfbc6f..98fe198 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -662,6 +662,9 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name,
                                                      unsigned int nmodes,
                                                      int reserve_depths) DECLSPEC_HIDDEN;

+void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
+void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
+
 /* XIM support */
 extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN;
 extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 528715b..7118486 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -47,7 +47,6 @@
 #include "winreg.h"

#include "x11drv.h"
-#include "xvidmode.h"
 #include "xrandr.h"
 #include "xcomposite.h"
 #include "wine/server.h"
@@ -575,10 +574,8 @@ static BOOL process_attach(void)
     xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) );
     X11DRV_Settings_Init();

-#ifdef SONAME_LIBXXF86VM
     /* initialize XVidMode */
     X11DRV_XF86VM_Init();
-#endif
 #ifdef SONAME_LIBXRANDR
     /* initialize XRandR */
     X11DRV_XRandR_Init();
@@ -625,10 +622,8 @@ static void thread_detach(void)
 static void process_detach(void)
 {
     X11DRV_Clipboard_Cleanup();
-#ifdef SONAME_LIBXXF86VM
     /* cleanup XVidMode */
     X11DRV_XF86VM_Cleanup();
-#endif
     X11DRV_XRender_Finalize();

/* cleanup GDI */
diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c
index f452da2..a308fff 100644
--- a/dlls/winex11.drv/xvidmode.c
+++ b/dlls/winex11.drv/xvidmode.c
@@ -34,8 +34,6 @@
 #include <X11/extensions/xf86vmproto.h>
 #endif

-#include "xvidmode.h"
-
 #include "windef.h"
 #include "wingdi.h"
 #include "ddrawi.h"
@@ -408,6 +406,17 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp)
   return ret;
 }

+#else /* SONAME_LIBXXF86VM */
+
+void X11DRV_XF86VM_Init(void)
+{
+    TRACE("XVidMode support not compiled in.\n");
+}
+
+void X11DRV_XF86VM_Cleanup(void)
+{
+}
+
 #endif /* SONAME_LIBXXF86VM */

/***********************************************************************
diff --git a/dlls/winex11.drv/xvidmode.h b/dlls/winex11.drv/xvidmode.h
deleted file mode 100644
index ac6ea2e..0000000
--- a/dlls/winex11.drv/xvidmode.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * DirectDraw HAL XVidMode interface
- *
- * Copyright 2001 TransGaming Technologies, Inc.
- *
- * 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_XVIDMODE_H
-#define __WINE_XVIDMODE_H
-
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
-#ifdef SONAME_LIBXXF86VM
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-
-void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN;
-void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN;
-
-#endif /* SONAME_LIBXXF86VM */
-#endif /* __WINE_XVIDMODE_H */