Andrew Talbot : kernel32: Replace inline static with static inline.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Mar 17 14:35:26 CDT 2007


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

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Sat Mar 17 10:22:45 2007 +0000

kernel32: Replace inline static with static inline.

---

 dlls/kernel32/computername.c |    2 +-
 dlls/kernel32/except.c       |    4 ++--
 dlls/kernel32/heap.c         |    2 +-
 dlls/kernel32/instr.c        |    8 ++++----
 dlls/kernel32/locale.c       |    4 ++--
 dlls/kernel32/ne_module.c    |    2 +-
 dlls/kernel32/path.c         |    4 ++--
 dlls/kernel32/process.c      |    4 ++--
 dlls/kernel32/relay16.c      |    4 ++--
 dlls/kernel32/selector.c     |    2 +-
 dlls/kernel32/sync.c         |    2 +-
 dlls/kernel32/thunk.c        |    2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c
index 754f86c..d2c0a7c 100644
--- a/dlls/kernel32/computername.c
+++ b/dlls/kernel32/computername.c
@@ -180,7 +180,7 @@ static BOOL dns_domainname ( char *name, int *size )
 /*********************************************************************** 
  *                      _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 --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c
index 725e4ec..a21a342 100644
--- a/dlls/kernel32/except.c
+++ b/dlls/kernel32/except.c
@@ -393,7 +393,7 @@ static	int	start_debugger_atomic(PEXCEPTION_POINTERS epointers)
  * 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 @@ inline static BOOL check_resource_write( void *addr )
  *
  * 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 --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 4297167..11aa580 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -78,7 +78,7 @@ static HANDLE systemHeap;   /* globally shared heap */
  *
  * Create the system heap.
  */
-inline static HANDLE HEAP_CreateSystemHeap(void)
+static inline HANDLE HEAP_CreateSystemHeap(void)
 {
     int created;
     void *base;
diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c
index 90e065b..a7e60f1 100644
--- a/dlls/kernel32/instr.c
+++ b/dlls/kernel32/instr.c
@@ -45,7 +45,7 @@ WINE_DECLARE_DEBUG_CHANNEL(io);
 #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 @@ inline static void add_stack( CONTEXT86 *context, int offset )
         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 @@ inline static void *make_ptr( CONTEXT86 *context, DWORD seg, DWORD off, int long
     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 @@ struct idtr
 
 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 --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index 5b09793..ee6967b 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -173,7 +173,7 @@ static inline void strcpynAtoW( WCHAR *dst, const char *src, size_t n )
  *
  * 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 @@ static LCID convert_default_lcid( LCID lcid, LCTYPE lctype )
  *
  * 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 --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c
index 25b0dcf..9e464e4 100644
--- a/dlls/kernel32/ne_module.c
+++ b/dlls/kernel32/ne_module.c
@@ -91,7 +91,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name );
 
 
 /* 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 --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
index 39fc176..b195435 100644
--- a/dlls/kernel32/path.c
+++ b/dlls/kernel32/path.c
@@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(file);
 
 
 /* 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 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR
  * 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 --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 983750e..8b8bd3c 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -102,7 +102,7 @@ extern void SHELL_LoadRegistry(void);
 /***********************************************************************
  *           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 @@ inline static int contains_path( LPCWSTR name )
  * 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 --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c
index 6b3f8a0..947ccf6 100644
--- a/dlls/kernel32/relay16.c
+++ b/dlls/kernel32/relay16.c
@@ -46,14 +46,14 @@ static const WCHAR **debug_snoop_excludelist;
 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 --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c
index 48b92c7..53ad5b4 100644
--- a/dlls/kernel32/selector.c
+++ b/dlls/kernel32/selector.c
@@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(selector);
 #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 --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index d3f2f4b..a58d983 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -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 --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c
index 631f8a1..5e10a5d 100644
--- a/dlls/kernel32/thunk.c
+++ b/dlls/kernel32/thunk.c
@@ -1629,7 +1629,7 @@ static SEGPTR    ThunkletCallbackGlueSL = 0;
 
 
 /* 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-cvs mailing list