MSVC compatibility fixes: inline -> __inline

svn path=/branches/ros-amd64-bringup/; revision=45426
This commit is contained in:
Timo Kreuzer 2010-02-05 01:36:20 +00:00
parent 28c8b7fbec
commit 139c298d14
5 changed files with 12 additions and 12 deletions

View file

@ -234,23 +234,23 @@ static WCHAR *xmlstrdupW(const xmlstr_t* str)
return strW;
}
static inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str)
static __inline BOOL xmlstr_cmp(const xmlstr_t* xmlstr, const WCHAR *str)
{
return !strncmpW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len];
}
static inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str)
static __inline BOOL xmlstr_cmpi(const xmlstr_t* xmlstr, const WCHAR *str)
{
return !strncmpiW(xmlstr->ptr, str, xmlstr->len) && !str[xmlstr->len];
}
static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str)
static __inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str)
{
return (xmlstr->len && xmlstr->ptr[0] == '/' &&
!strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]);
}
static inline BOOL isxmlspace( WCHAR ch )
static __inline BOOL isxmlspace( WCHAR ch )
{
return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t');
}
@ -498,7 +498,7 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai)
return ret;
}
static inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHAR *str )
static __inline void append_string( WCHAR *buffer, const WCHAR *prefix, const WCHAR *str )
{
WCHAR *p = buffer;
@ -562,7 +562,7 @@ static ACTIVATION_CONTEXT *check_actctx( HANDLE h )
return ret;
}
static inline void actctx_addref( ACTIVATION_CONTEXT *actctx )
static __inline void actctx_addref( ACTIVATION_CONTEXT *actctx )
{
_InterlockedExchangeAdd( &actctx->ref_count, 1 );
}

View file

@ -219,7 +219,7 @@ static __inline unsigned int get_freelist_index( SIZE_T size )
}
/* get the memory protection type to use for a given heap */
static inline ULONG get_protection_type( DWORD flags )
static __inline ULONG get_protection_type( DWORD flags )
{
return (flags & HEAP_CREATE_ENABLE_EXECUTE) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
}

View file

@ -27,7 +27,7 @@ RtlpInitializeTimerThread(VOID)
return STATUS_NOT_IMPLEMENTED;
}
static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout )
static __inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout )
{
if (timeout == INFINITE) return NULL;
pTime->QuadPart = (ULONGLONG)timeout * -10000;
@ -101,7 +101,7 @@ static DWORD WINAPI timer_callback_wrapper(LPVOID p)
return 0;
}
static inline ULONGLONG queue_current_time(void)
static __inline ULONGLONG queue_current_time(void)
{
LARGE_INTEGER now;
NtQuerySystemTime(&now);
@ -134,7 +134,7 @@ static void queue_add_timer(struct queue_timer *t, ULONGLONG time,
NtSetEvent(q->event, NULL);
}
static inline void queue_move_timer(struct queue_timer *t, ULONGLONG time,
static __inline void queue_move_timer(struct queue_timer *t, ULONGLONG time,
BOOL set_event)
{
/* We MUST hold the queue cs while calling this function. */

View file

@ -22,7 +22,7 @@ RtlGetVersion(
/* FUNCTIONS ****************************************************************/
static inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition)
static __inline NTSTATUS version_compare_values(ULONG left, ULONG right, UCHAR condition)
{
switch (condition) {
case VER_EQUAL:

View file

@ -31,7 +31,7 @@ typedef struct _RTLP_WAIT
/* PRIVATE FUNCTIONS *******************************************************/
static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout )
static __inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout )
{
if (timeout == INFINITE) return NULL;
pTime->QuadPart = (ULONGLONG)timeout * -10000;