[ros-diffs] [tkreuzer] 45426: [RTL] MSVC compatibility fixes: inline -> __inline
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Fri Feb 5 02:36:20 CET 2010
Author: tkreuzer
Date: Fri Feb 5 02:36:20 2010
New Revision: 45426
URL: http://svn.reactos.org/svn/reactos?rev=45426&view=rev
Log:
[RTL]
MSVC compatibility fixes: inline -> __inline
Modified:
branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c
branches/ros-amd64-bringup/reactos/lib/rtl/heap.c
branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c
branches/ros-amd64-bringup/reactos/lib/rtl/version.c
branches/ros-amd64-bringup/reactos/lib/rtl/wait.c
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c?rev=45426&r1=45425&r2=45426&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/rtl/actctx.c [iso-8859-1] Fri Feb 5 02:36:20 2010
@@ -234,23 +234,23 @@
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 @@
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 @@
return ret;
}
-static inline void actctx_addref( ACTIVATION_CONTEXT *actctx )
+static __inline void actctx_addref( ACTIVATION_CONTEXT *actctx )
{
_InterlockedExchangeAdd( &actctx->ref_count, 1 );
}
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rtl/heap.c?rev=45426&r1=45425&r2=45426&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] Fri Feb 5 02:36:20 2010
@@ -219,7 +219,7 @@
}
/* 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;
}
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c?rev=45426&r1=45425&r2=45426&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/rtl/timerqueue.c [iso-8859-1] Fri Feb 5 02:36:20 2010
@@ -27,7 +27,7 @@
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 @@
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 @@
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. */
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/version.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rtl/version.c?rev=45426&r1=45425&r2=45426&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/rtl/version.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/rtl/version.c [iso-8859-1] Fri Feb 5 02:36:20 2010
@@ -22,7 +22,7 @@
/* 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:
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/wait.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rtl/wait.c?rev=45426&r1=45425&r2=45426&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/lib/rtl/wait.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/lib/rtl/wait.c [iso-8859-1] Fri Feb 5 02:36:20 2010
@@ -31,7 +31,7 @@
/* 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;
More information about the Ros-diffs
mailing list