kernel32: Replace inline static with static inline
Andrew Talbot
Andrew.Talbot at talbotville.com
Sat Mar 17 05:22:45 CDT 2007
Changelog:
kernel32: Replace inline static with static inline.
diff -urN a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c
--- a/dlls/kernel32/computername.c 2007-03-09 17:25:10.000000000 +0000
+++ b/dlls/kernel32/computername.c 2007-03-17 10:20:04.000000000 +0000
@@ -180,7 +180,7 @@
/***********************************************************************
* _init_attr (INTERNAL)
*/
-inline static void _init_attr ( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *name )
+static inline void _init_attr ( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *name )
{
attr->Length = sizeof (OBJECT_ATTRIBUTES);
attr->RootDirectory = 0;
diff -urN a/dlls/kernel32/except.c b/dlls/kernel32/except.c
--- a/dlls/kernel32/except.c 2006-10-13 11:27:18.000000000 +0100
+++ b/dlls/kernel32/except.c 2007-03-17 10:20:04.000000000 +0000
@@ -393,7 +393,7 @@
* If yes, we unprotect the resources to let broken apps continue
* (Windows does this too).
*/
-inline static BOOL check_resource_write( void *addr )
+static inline BOOL check_resource_write( void *addr )
{
void *rsrc;
DWORD size;
@@ -416,7 +416,7 @@
*
* Check for executing a protected area.
*/
-inline static BOOL check_no_exec( void *addr )
+static inline BOOL check_no_exec( void *addr )
{
MEMORY_BASIC_INFORMATION info;
diff -urN a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
--- a/dlls/kernel32/heap.c 2007-03-15 17:31:31.000000000 +0000
+++ b/dlls/kernel32/heap.c 2007-03-17 10:20:04.000000000 +0000
@@ -78,7 +78,7 @@
*
* Create the system heap.
*/
-inline static HANDLE HEAP_CreateSystemHeap(void)
+static inline HANDLE HEAP_CreateSystemHeap(void)
{
int created;
void *base;
diff -urN a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c
--- a/dlls/kernel32/instr.c 2006-12-05 17:37:11.000000000 +0000
+++ b/dlls/kernel32/instr.c 2007-03-17 10:20:04.000000000 +0000
@@ -45,7 +45,7 @@
#define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val)))
#define ISV86(context) ((context)->EFlags & 0x00020000)
-inline static void add_stack( CONTEXT86 *context, int offset )
+static inline void add_stack( CONTEXT86 *context, int offset )
{
if (ISV86(context) || !IS_SELECTOR_32BIT(context->SegSs))
ADD_LOWORD( context->Esp, offset );
@@ -53,7 +53,7 @@
context->Esp += offset;
}
-inline static void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long_addr )
+static inline void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long_addr )
{
if (ISV86(context)) return (void *)((seg << 4) + LOWORD(off));
if (wine_ldt_is_system(seg)) return (void *)off;
@@ -61,7 +61,7 @@
return (char *) MapSL( MAKESEGPTR( seg, 0 ) ) + off;
}
-inline static void *get_stack( CONTEXT86 *context )
+static inline void *get_stack( CONTEXT86 *context )
{
if (ISV86(context)) return (void *)((context->SegSs << 4) + LOWORD(context->Esp));
return wine_ldt_get_ptr( context->SegSs, context->Esp );
@@ -77,7 +77,7 @@
static LDT_ENTRY idt[256];
-inline static struct idtr get_idtr(void)
+static inline struct idtr get_idtr(void)
{
struct idtr ret;
#if defined(__i386__) && defined(__GNUC__)
diff -urN a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
--- a/dlls/kernel32/locale.c 2007-03-15 17:31:31.000000000 +0000
+++ b/dlls/kernel32/locale.c 2007-03-17 10:20:04.000000000 +0000
@@ -173,7 +173,7 @@
*
* Retrieve the ANSI codepage for a given locale.
*/
-inline static UINT get_lcid_codepage( LCID lcid )
+static inline UINT get_lcid_codepage( LCID lcid )
{
UINT ret;
if (!GetLocaleInfoW( lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (WCHAR *)&ret,
@@ -563,7 +563,7 @@
*
* Create the Control Panel\\International registry key.
*/
-inline static HANDLE create_registry_key(void)
+static inline HANDLE create_registry_key(void)
{
static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\',
'I','n','t','e','r','n','a','t','i','o','n','a','l',0};
diff -urN a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c
--- a/dlls/kernel32/ne_module.c 2007-02-05 17:39:17.000000000 +0000
+++ b/dlls/kernel32/ne_module.c 2007-03-17 10:20:04.000000000 +0000
@@ -91,7 +91,7 @@
/* patch all the flat cs references of the code segment if necessary */
-inline static void patch_code_segment( NE_MODULE *pModule )
+static inline void patch_code_segment( NE_MODULE *pModule )
{
#ifdef __i386__
int i;
diff -urN a/dlls/kernel32/path.c b/dlls/kernel32/path.c
--- a/dlls/kernel32/path.c 2007-01-02 14:12:49.000000000 +0000
+++ b/dlls/kernel32/path.c 2007-03-17 10:20:04.000000000 +0000
@@ -47,7 +47,7 @@
/* check if a file name is for an executable file (.exe or .com) */
-inline static BOOL is_executable( const WCHAR *name )
+static inline BOOL is_executable( const WCHAR *name )
{
static const WCHAR exeW[] = {'.','e','x','e',0};
static const WCHAR comW[] = {'.','c','o','m',0};
@@ -708,7 +708,7 @@
* Check if the file name contains a path; helper for SearchPathW.
* A relative path is not considered a path unless it starts with ./ or ../
*/
-inline static BOOL contains_pathW (LPCWSTR name)
+static inline BOOL contains_pathW (LPCWSTR name)
{
if (RtlDetermineDosPathNameType_U( name ) != RELATIVE_PATH) return TRUE;
if (name[0] != '.') return FALSE;
diff -urN a/dlls/kernel32/process.c b/dlls/kernel32/process.c
--- a/dlls/kernel32/process.c 2007-03-08 17:37:17.000000000 +0000
+++ b/dlls/kernel32/process.c 2007-03-17 10:20:04.000000000 +0000
@@ -102,7 +102,7 @@
/***********************************************************************
* contains_path
*/
-inline static int contains_path( LPCWSTR name )
+static inline int contains_path( LPCWSTR name )
{
return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\'));
}
@@ -114,7 +114,7 @@
* Check if an environment variable needs to be handled specially when
* passed through the Unix environment (i.e. prefixed with "WINE").
*/
-inline static int is_special_env_var( const char *var )
+static inline int is_special_env_var( const char *var )
{
return (!strncmp( var, "PATH=", sizeof("PATH=")-1 ) ||
!strncmp( var, "HOME=", sizeof("HOME=")-1 ) ||
diff -urN a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c
--- a/dlls/kernel32/relay16.c 2007-01-17 17:24:36.000000000 +0000
+++ b/dlls/kernel32/relay16.c 2007-03-17 10:20:04.000000000 +0000
@@ -46,14 +46,14 @@
static const WCHAR **debug_snoop_includelist;
/* compare an ASCII and a Unicode string without depending on the current codepage */
-inline static int strcmpiAW( const char *strA, const WCHAR *strW )
+static inline int strcmpiAW( const char *strA, const WCHAR *strW )
{
while (*strA && (toupperW((unsigned char)*strA) == toupperW(*strW))) { strA++; strW++; }
return toupperW((unsigned char)*strA) - toupperW(*strW);
}
/* compare an ASCII and a Unicode string without depending on the current codepage */
-inline static int strncmpiAW( const char *strA, const WCHAR *strW, int n )
+static inline int strncmpiAW( const char *strA, const WCHAR *strW, int n )
{
int ret = 0;
for ( ; n > 0; n--, strA++, strW++)
diff -urN a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c
--- a/dlls/kernel32/selector.c 2007-01-17 17:24:36.000000000 +0000
+++ b/dlls/kernel32/selector.c 2007-03-17 10:20:04.000000000 +0000
@@ -35,7 +35,7 @@
#define LDT_SIZE 8192
/* get the number of selectors needed to cover up to the selector limit */
-inline static WORD get_sel_count( WORD sel )
+static inline WORD get_sel_count( WORD sel )
{
return (wine_ldt_copy.limit[sel >> __AHSHIFT] >> 16) + 1;
}
diff -urN a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
--- a/dlls/kernel32/sync.c 2007-03-06 17:28:20.000000000 +0000
+++ b/dlls/kernel32/sync.c 2007-03-17 10:20:04.000000000 +0000
@@ -51,7 +51,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(sync);
/* check if current version is NT or Win95 */
-inline static int is_version_nt(void)
+static inline int is_version_nt(void)
{
return !(GetVersion() & 0x80000000);
}
diff -urN a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c
--- a/dlls/kernel32/thunk.c 2007-01-17 17:24:36.000000000 +0000
+++ b/dlls/kernel32/thunk.c 2007-03-17 10:20:04.000000000 +0000
@@ -1629,7 +1629,7 @@
/* map a thunk allocated on ThunkletHeap to a 16-bit pointer */
-inline static SEGPTR get_segptr( void *thunk )
+static inline SEGPTR get_segptr( void *thunk )
{
if (!thunk) return 0;
return MAKESEGPTR( ThunkletCodeSel, (char *)thunk - (char *)ThunkletHeap );
More information about the wine-patches
mailing list