Alexandre Julliard : user32: Make drivers non-const to avoid a compiler warning.

Alexandre Julliard julliard at winehq.org
Thu Apr 24 06:23:43 CDT 2008


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Apr 24 11:53:58 2008 +0200

user32: Make drivers non-const to avoid a compiler warning.

---

 dlls/user32/driver.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index bdca8f9..305e1e5 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -27,7 +27,7 @@
 
 #include "user_private.h"
 
-static const USER_DRIVER null_driver, lazy_load_driver;
+static USER_DRIVER null_driver, lazy_load_driver;
 
 const USER_DRIVER *USER_Driver = &lazy_load_driver;
 static DWORD driver_load_error;
@@ -125,7 +125,7 @@ static const USER_DRIVER *load_driver(void)
 #undef GET_USER_FUNC
     }
 
-    prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, (void *)&lazy_load_driver );
+    prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver );
     if (prev != &lazy_load_driver)
     {
         /* another thread beat us to it */
@@ -410,7 +410,7 @@ static LRESULT nulldrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM
     return 0;
 }
 
-static const USER_DRIVER null_driver =
+static USER_DRIVER null_driver =
 {
     /* keyboard functions */
     nulldrv_ActivateKeyboardLayout,
@@ -736,7 +736,7 @@ static LRESULT loaderdrv_WindowMessage( HWND hwnd, UINT msg, WPARAM wparam, LPAR
     return load_driver()->pWindowMessage( hwnd, msg, wparam, lparam );
 }
 
-static const USER_DRIVER lazy_load_driver =
+static USER_DRIVER lazy_load_driver =
 {
     /* keyboard functions */
     loaderdrv_ActivateKeyboardLayout,




More information about the wine-cvs mailing list