winex11.drv: Replace inline static with static inline

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Mar 17 05:47:28 CDT 2007


Changelog:
    winex11.drv: Replace inline static with static inline.

diff -urN a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
--- a/dlls/winex11.drv/dib.c	2007-03-12 17:34:02.000000000 +0000
+++ b/dlls/winex11.drv/dib.c	2007-03-17 10:46:19.000000000 +0000
@@ -111,7 +111,7 @@
  *
  * Return the width of an X image in bytes
  */
-inline static int X11DRV_DIB_GetXImageWidthBytes( int width, int depth )
+static inline int X11DRV_DIB_GetXImageWidthBytes( int width, int depth )
 {
     if (!depth || depth > 32) goto error;
 
diff -urN a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
--- a/dlls/winex11.drv/event.c	2006-10-25 17:36:34.000000000 +0100
+++ b/dlls/winex11.drv/event.c	2007-03-17 10:46:19.000000000 +0000
@@ -351,7 +351,7 @@
  *
  * Check if we can activate the specified window.
  */
-inline static BOOL can_activate_window( HWND hwnd )
+static inline BOOL can_activate_window( HWND hwnd )
 {
     LONG style = GetWindowLongW( hwnd, GWL_STYLE );
     if (!(style & WS_VISIBLE)) return FALSE;
diff -urN a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
--- a/dlls/winex11.drv/keyboard.c	2007-03-06 17:28:21.000000000 +0000
+++ b/dlls/winex11.drv/keyboard.c	2007-03-17 10:46:19.000000000 +0000
@@ -1293,7 +1293,7 @@
  * Updates internal state for <vkey>, depending on key <state> under X
  *
  */
-inline static void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time )
+static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time )
 {
     /* Do something if internal table state != X state for keycode */
     if (((key_state_table[vkey] & 0x80)!=0) != state)
diff -urN a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
--- a/dlls/winex11.drv/opengl.c	2007-03-13 17:26:11.000000000 +0000
+++ b/dlls/winex11.drv/opengl.c	2007-03-17 10:46:19.000000000 +0000
@@ -541,7 +541,7 @@
  *
  * For use by wglGetCurrentReadDCARB.
  */
-inline static HDC get_hdc_from_Drawable(GLXDrawable d)
+static inline HDC get_hdc_from_Drawable(GLXDrawable d)
 {
     Wine_GLContext *ret;
     for (ret = context_list; ret; ret = ret->next) {
@@ -552,7 +552,7 @@
     return NULL;
 }
 
-inline static BOOL is_valid_context( Wine_GLContext *ctx )
+static inline BOOL is_valid_context( Wine_GLContext *ctx )
 {
     Wine_GLContext *ptr;
     for (ptr = context_list; ptr; ptr = ptr->next) if (ptr == ctx) break;
diff -urN a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
--- a/dlls/winex11.drv/window.c	2007-02-13 17:12:39.000000000 +0000
+++ b/dlls/winex11.drv/window.c	2007-03-17 10:46:19.000000000 +0000
@@ -67,7 +67,7 @@
  *
  * Check if a given window should be managed
  */
-inline static BOOL is_window_managed( HWND hwnd )
+static inline BOOL is_window_managed( HWND hwnd )
 {
     DWORD style, ex_style;
 
diff -urN a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
--- a/dlls/winex11.drv/wintab.c	2007-02-07 17:34:47.000000000 +0000
+++ b/dlls/winex11.drv/wintab.c	2007-03-17 10:46:19.000000000 +0000
@@ -758,7 +758,7 @@
 }
 
 
-inline static int CopyTabletData(LPVOID target, LPVOID src, INT size)
+static inline int CopyTabletData(LPVOID target, LPVOID src, INT size)
 {
     /*
      * It is valid to call CopyTabletData with NULL.
diff -urN a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
--- a/dlls/winex11.drv/x11drv.h	2007-03-03 11:39:48.000000000 +0000
+++ b/dlls/winex11.drv/x11drv.h	2007-03-17 10:46:19.000000000 +0000
@@ -510,14 +510,14 @@
 extern struct x11drv_thread_data *x11drv_init_thread_data(void);
 extern DWORD thread_data_tls_index;
 
-inline static struct x11drv_thread_data *x11drv_thread_data(void)
+static inline struct x11drv_thread_data *x11drv_thread_data(void)
 {
     struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index );
     if (!data) data = x11drv_init_thread_data();
     return data;
 }
 
-inline static Display *thread_display(void) { return x11drv_thread_data()->display; }
+static inline Display *thread_display(void) { return x11drv_thread_data()->display; }
 
 extern Visual *visual;
 extern Window root_window;
diff -urN a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
--- a/dlls/winex11.drv/x11drv_main.c	2007-01-06 11:38:11.000000000 +0000
+++ b/dlls/winex11.drv/x11drv_main.c	2007-03-17 10:46:19.000000000 +0000
@@ -274,7 +274,7 @@
  *
  * Get a config key from either the app-specific or the default config
  */
-inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
+static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name,
                                     char *buffer, DWORD size )
 {
     if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0;
diff -urN a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
--- a/dlls/winex11.drv/xfont.c	2007-03-12 17:34:02.000000000 +0000
+++ b/dlls/winex11.drv/xfont.c	2007-03-17 10:46:19.000000000 +0000
@@ -365,7 +365,7 @@
 /***********************************************************************
  *           is_stock_font
  */
-inline static BOOL is_stock_font( HFONT font )
+static inline BOOL is_stock_font( HFONT font )
 {
     int i;
     for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++)



More information about the wine-patches mailing list