winex11.drv: Replace inline static with static inline.

This commit is contained in:
Andrew Talbot 2007-03-17 10:47:28 +00:00 committed by Alexandre Julliard
parent 2f5f3825c6
commit a33f71a32d
9 changed files with 11 additions and 11 deletions

View File

@ -111,7 +111,7 @@ static void X11DRV_DIB_Unlock(X_PHYSBITMAP *,BOOL);
* *
* Return the width of an X image in bytes * 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; if (!depth || depth > 32) goto error;

View File

@ -351,7 +351,7 @@ DWORD EVENT_x11_time_to_win32_time(Time time)
* *
* Check if we can activate the specified window. * 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 ); LONG style = GetWindowLongW( hwnd, GWL_STYLE );
if (!(style & WS_VISIBLE)) return FALSE; if (!(style & WS_VISIBLE)) return FALSE;

View File

@ -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 * 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 */ /* Do something if internal table state != X state for keycode */
if (((key_state_table[vkey] & 0x80)!=0) != state) if (((key_state_table[vkey] & 0x80)!=0) != state)

View File

@ -541,7 +541,7 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx)
* *
* For use by wglGetCurrentReadDCARB. * 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; Wine_GLContext *ret;
for (ret = context_list; ret; ret = ret->next) { for (ret = context_list; ret; ret = ret->next) {
@ -552,7 +552,7 @@ inline static HDC get_hdc_from_Drawable(GLXDrawable d)
return NULL; return NULL;
} }
inline static BOOL is_valid_context( Wine_GLContext *ctx ) static inline BOOL is_valid_context( Wine_GLContext *ctx )
{ {
Wine_GLContext *ptr; Wine_GLContext *ptr;
for (ptr = context_list; ptr; ptr = ptr->next) if (ptr == ctx) break; for (ptr = context_list; ptr; ptr = ptr->next) if (ptr == ctx) break;

View File

@ -67,7 +67,7 @@ static const char visual_id_prop[] = "__wine_x11_visual_id";
* *
* Check if a given window should be managed * 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; DWORD style, ex_style;

View File

@ -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. * It is valid to call CopyTabletData with NULL.

View File

@ -510,14 +510,14 @@ struct x11drv_thread_data
extern struct x11drv_thread_data *x11drv_init_thread_data(void); extern struct x11drv_thread_data *x11drv_init_thread_data(void);
extern DWORD thread_data_tls_index; 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 ); struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index );
if (!data) data = x11drv_init_thread_data(); if (!data) data = x11drv_init_thread_data();
return 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 Visual *visual;
extern Window root_window; extern Window root_window;

View File

@ -274,7 +274,7 @@ void wine_tsx11_unlock(void)
* *
* Get a config key from either the app-specific or the default config * 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 ) char *buffer, DWORD size )
{ {
if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0;

View File

@ -365,7 +365,7 @@ static int fontLF = -1, fontMRU = -1; /* last free, most recently used */
/*********************************************************************** /***********************************************************************
* is_stock_font * is_stock_font
*/ */
inline static BOOL is_stock_font( HFONT font ) static inline BOOL is_stock_font( HFONT font )
{ {
int i; int i;
for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++) for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++)