Andrew Talbot : winex11.drv: Replace inline static with static inline.

[Alexandre Julliard]

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

Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com>
Date:   Sat Mar 17 10:47:28 2007 +0000

winex11.drv: Replace inline static with static inline.

---

 dlls/winex11.drv/dib.c         |    2 +-
 dlls/winex11.drv/event.c       |    2 +-
 dlls/winex11.drv/keyboard.c    |    2 +-
 dlls/winex11.drv/opengl.c      |    4 ++--
 dlls/winex11.drv/window.c      |    2 +-
 dlls/winex11.drv/wintab.c      |    2 +-
 dlls/winex11.drv/x11drv.h      |    4 ++--
 dlls/winex11.drv/x11drv_main.c |    2 +-
 dlls/winex11.drv/xfont.c       |    2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index 82cacab..c921034 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -111,7 +111,7 @@ static void X11DRV_DIB_Unlock(X_PHYSBITMAP *,BOOL);
  *
  * 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 --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index fd84fb9..0ea1f9c 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -351,7 +351,7 @@ DWORD EVENT_x11_time_to_win32_time(Time time)
  *
  * 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 --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 218919f..96a0dc1 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1293,7 +1293,7 @@ static void KEYBOARD_GenerateMsg( WORD vkey, WORD scan, int Evtype, DWORD event_
  * 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 --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 40752fc..0e2f9ee 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -541,7 +541,7 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx)
  *
  * 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 @@ inline static HDC get_hdc_from_Drawable(GLXDrawable d)
     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 --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index 38da952..a31227f 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -67,7 +67,7 @@ static const char visual_id_prop[]    = "__wine_x11_visual_id";
  *
  * 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 --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index c6b65a1..d96ee05 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -758,7 +758,7 @@ int X11DRV_GetCurrentPacket(LPWTPACKET *packet)
 }
 
 
-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 --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 8012d3b..723a41a 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -510,14 +510,14 @@ struct x11drv_thread_data
 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 --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 229ca77..078a514 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -274,7 +274,7 @@ void wine_tsx11_unlock(void)
  *
  * 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 --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c
index 34ed2f1..60bd70d 100644
--- a/dlls/winex11.drv/xfont.c
+++ b/dlls/winex11.drv/xfont.c
@@ -365,7 +365,7 @@ static int		fontLF = -1, fontMRU = -1;	/* last free, most recently used */
 /***********************************************************************
  *           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++)