msvcrt: Replace inline static with static inline
Andrew Talbot
Andrew.Talbot at talbotville.com
Mon Mar 19 14:48:07 CDT 2007
Changelog:
msvcrt: Replace inline static with static inline.
diff -urN a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
--- a/dlls/msvcrt/cppexcept.c 2007-01-17 17:24:38.000000000 +0000
+++ b/dlls/msvcrt/cppexcept.c 2007-03-19 19:11:25.000000000 +0000
@@ -49,7 +49,7 @@
EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel );
/* call a function with a given ebp */
-inline static void *call_ebp_func( void *func, void *ebp )
+static inline void *call_ebp_func( void *func, void *ebp )
{
void *ret;
int dummy;
@@ -65,7 +65,7 @@
}
/* call a copy constructor */
-inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
+static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )
{
TRACE( "calling copy ctor %p object %p src %p\n", func, this, src );
if (has_vbase)
@@ -78,13 +78,13 @@
}
/* call the destructor of the exception object */
-inline static void call_dtor( void *func, void *object )
+static inline void call_dtor( void *func, void *object )
{
__asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" );
}
/* continue execution to the specified address after exception is caught */
-inline static void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr )
+static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr )
{
__asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1"
: : "r" (frame), "a" (addr) );
@@ -276,7 +276,7 @@
/* find and call the appropriate catch block for an exception */
/* returns the address to continue execution to after the catch block was called */
-inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame,
+static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame,
const cxx_function_descr *descr, int nested_trylevel,
cxx_exception_type *info )
{
diff -urN a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
--- a/dlls/msvcrt/except.c 2007-03-19 17:26:48.000000000 +0000
+++ b/dlls/msvcrt/except.c 2007-03-19 19:11:25.000000000 +0000
@@ -66,13 +66,13 @@
#define TRYLEVEL_END (-1) /* End of trylevel list */
#if defined(__GNUC__) && defined(__i386__)
-inline static void call_finally_block( void *code_block, void *base_ptr )
+static inline void call_finally_block( void *code_block, void *base_ptr )
{
__asm__ __volatile__ ("movl %1,%%ebp; call *%%eax"
: : "a" (code_block), "g" (base_ptr));
}
-inline static DWORD call_filter( void *func, void *arg, void *ebp )
+static inline DWORD call_filter( void *func, void *arg, void *ebp )
{
DWORD ret;
__asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp"
More information about the wine-patches
mailing list