Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

inline -> __inline

Browse source 
patch by Brezenbak - small modifications by me

svn path=/trunk/; revision=19734
This commit is contained in:
Royce Mitchell III 2005-11-28 23:35:35 +00:00
parent 1a278f4518
commit 8c581cc643
42 changed files with 251 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/apps/utils/pice/module/shell.c
View file

@ -293,7 +293,7 @@ void ProcessBootParams(void)
// bNoCtrlKeys() // bNoCtrlKeys()
// //
//************************************************************************* //*************************************************************************
BOOLEAN inline bNoCtrlKeys(void) BOOLEAN __inline bNoCtrlKeys(void)
{ {
return (!bControl && !bAlt && !bShift); return (!bControl && !bAlt && !bShift);
} }

10
reactos/boot/freeldr/freeldr/inffile/inffile.c
View file

@ -387,7 +387,7 @@ InfpCacheFindKeyLine (PINFCACHESECTION Section,
/* push the current state on the parser stack */ /* push the current state on the parser stack */
inline static void push_state( struct parser *parser, enum parser_state state ) __inline static void push_state( struct parser *parser, enum parser_state state )
{ {
// assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) ); // assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) );
parser->stack[parser->stack_pos++] = state; parser->stack[parser->stack_pos++] = state;
@ -395,7 +395,7 @@ inline static void push_state( struct parser *parser, enum parser_state state )
/* pop the current state */ /* pop the current state */
inline static void pop_state( struct parser *parser ) __inline static void pop_state( struct parser *parser )
{ {
// assert( parser->stack_pos ); // assert( parser->stack_pos );
parser->state = parser->stack[--parser->stack_pos]; parser->state = parser->stack[--parser->stack_pos];
@ -403,7 +403,7 @@ inline static void pop_state( struct parser *parser )
/* set the parser state and return the previous one */ /* set the parser state and return the previous one */
inline static enum parser_state set_state( struct parser *parser, enum parser_state state ) __inline static enum parser_state set_state( struct parser *parser, enum parser_state state )
{ {
enum parser_state ret = parser->state; enum parser_state ret = parser->state;
parser->state = state; parser->state = state;
@ -412,14 +412,14 @@ inline static enum parser_state set_state( struct parser *parser, enum parser_st
/* check if the pointer points to an end of file */ /* check if the pointer points to an end of file */
inline static int is_eof( struct parser *parser, const CHAR *ptr ) __inline static int is_eof( struct parser *parser, const CHAR *ptr )
{ {
return (ptr >= parser->end || *ptr == CONTROL_Z); return (ptr >= parser->end || *ptr == CONTROL_Z);
} }
/* check if the pointer points to an end of line */ /* check if the pointer points to an end of line */
inline static int is_eol( struct parser *parser, const CHAR *ptr ) __inline static int is_eol( struct parser *parser, const CHAR *ptr )
{ {
return (ptr >= parser->end || return (ptr >= parser->end ||
*ptr == CONTROL_Z || *ptr == CONTROL_Z ||

4
reactos/boot/freeldr/freeldr/math/libgcc2.c
View file

@ -60,7 +60,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#if defined (L_negdi2) || defined (L_divdi3) || defined (L_moddi3) #if defined (L_negdi2) || defined (L_divdi3) || defined (L_moddi3)
#if defined (L_divdi3) || defined (L_moddi3) #if defined (L_divdi3) || defined (L_moddi3)
static inline static __inline
#endif #endif
DWtype DWtype
__negdi2 (DWtype u) __negdi2 (DWtype u)
@ -514,7 +514,7 @@ const UQItype __clz_tab[] =
#if (defined (L_udivdi3) || defined (L_divdi3) || \ #if (defined (L_udivdi3) || defined (L_divdi3) || \
defined (L_umoddi3) || defined (L_moddi3)) defined (L_umoddi3) || defined (L_moddi3))
static inline static __inline
#endif #endif
UDWtype UDWtype
__udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp) __udivmoddi4 (UDWtype n, UDWtype d, UDWtype *rp)

2
reactos/drivers/fs/cdfs/fsctl.c
View file

@ -35,7 +35,7 @@
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
static inline static __inline
int msf_to_lba (BYTE m, BYTE s, BYTE f) int msf_to_lba (BYTE m, BYTE s, BYTE f)
{ {
return (((m * 60) + s) * 75 + f) - 150; return (((m * 60) + s) * 75 + f) - 150;

4
reactos/drivers/lib/oskittcp/include/memtrack.h
View file

@ -49,12 +49,12 @@ VOID TrackDumpFL( PCHAR File, DWORD Line );
#define TrackDump() TrackDumpFL(__FILE__,__LINE__) #define TrackDump() TrackDumpFL(__FILE__,__LINE__)
VOID TrackTag( DWORD Tag ); VOID TrackTag( DWORD Tag );
static inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { static __inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) {
PVOID Out = ExAllocatePool( type, size ); PVOID Out = ExAllocatePool( type, size );
if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line ); if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line );
return Out; return Out;
} }
static inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { static __inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) {
UntrackFL(File, Line, Data); UntrackFL(File, Line, Data);
ExFreePool(Data); ExFreePool(Data);
} }

2
reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
View file

@ -16,7 +16,7 @@ void *memset( void *dest, int c, size_t count );
#define bzero(x,y) memset(x,0,y) #define bzero(x,y) memset(x,0,y)
#define bcopy(src,dst,n) memcpy(dst,src,n) #define bcopy(src,dst,n) memcpy(dst,src,n)
#ifdef _MSC_VER #ifdef _MSC_VER
static inline void panic ( const char* fmt, ... ) static __inline void panic ( const char* fmt, ... )
{ {
va_list arg; va_list arg;
va_start(arg, fmt); va_start(arg, fmt);

4
reactos/drivers/lib/undis/include/ndishack.h
View file

@ -27,7 +27,7 @@ struct _RECURSIVE_MUTEX;
* Entry = Pointer to the entry that is inserted in the lookaside list * Entry = Pointer to the entry that is inserted in the lookaside list
*/ */
static static
inline __inline
VOID VOID
ExFreeToNPagedLookasideList ( ExFreeToNPagedLookasideList (
IN PNPAGED_LOOKASIDE_LIST Lookaside, IN PNPAGED_LOOKASIDE_LIST Lookaside,
@ -54,7 +54,7 @@ ExFreeToNPagedLookasideList (
* Address of the allocated list entry * Address of the allocated list entry
*/ */
static static
inline __inline
PVOID PVOID
ExAllocateFromNPagedLookasideList ( ExAllocateFromNPagedLookasideList (
IN PNPAGED_LOOKASIDE_LIST Lookaside IN PNPAGED_LOOKASIDE_LIST Lookaside

4
reactos/drivers/lib/undis/ndis/compat.c
View file

@ -73,7 +73,7 @@ ExInterlockedInsertTailList(PLIST_ENTRY ListHead,
} }
static static
inline __inline
PSINGLE_LIST_ENTRY PSINGLE_LIST_ENTRY
PopEntrySList( PopEntrySList(
PSLIST_HEADER ListHead PSLIST_HEADER ListHead
@ -93,7 +93,7 @@ PSINGLE_LIST_ENTRY
static static
inline __inline
VOID VOID
PushEntrySList ( PushEntrySList (
PSLIST_HEADER ListHead, PSLIST_HEADER ListHead,

4
reactos/drivers/net/tcpip/include/memtrack.h
View file

@ -40,12 +40,12 @@ VOID TrackDumpFL( PCHAR File, DWORD Line );
#define TrackDump() TrackDumpFL(__FILE__,__LINE__) #define TrackDump() TrackDumpFL(__FILE__,__LINE__)
VOID TrackTag( DWORD Tag ); VOID TrackTag( DWORD Tag );
static inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) { static __inline PVOID ExAllocatePoolX( POOL_TYPE type, SIZE_T size, PCHAR File, ULONG Line ) {
PVOID Out = PoolAllocateBuffer( size ); PVOID Out = PoolAllocateBuffer( size );
if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line ); if( Out ) TrackWithTag( EXALLOC_TAG, Out, File, Line );
return Out; return Out;
} }
static inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) { static __inline VOID ExFreePoolX( PVOID Data, PCHAR File, ULONG Line ) {
UntrackFL(File, Line, Data); UntrackFL(File, Line, Data);
PoolFreeBuffer(Data); PoolFreeBuffer(Data);
} }

284
reactos/drivers/net/tcpip/include/tcpcore.h
View file

File diff suppressed because it is too large Load diff

8
reactos/hal/halx86/include/apic.h
View file

@ -191,17 +191,17 @@ extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */
/* Prototypes */ /* Prototypes */
inline VOID APICWrite(ULONG Offset, ULONG Value); __inline VOID APICWrite(ULONG Offset, ULONG Value);
inline ULONG APICRead(ULONG Offset); __inline ULONG APICRead(ULONG Offset);
VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSendIPI(ULONG Target, ULONG Mode);
VOID APICSetup(VOID); VOID APICSetup(VOID);
VOID HaliInitBSP(VOID); VOID HaliInitBSP(VOID);
VOID APICSyncArbIDs(VOID); VOID APICSyncArbIDs(VOID);
inline VOID APICSendEOI(VOID); __inline VOID APICSendEOI(VOID);
VOID APICCalibrateTimer(ULONG CPU); VOID APICCalibrateTimer(ULONG CPU);
VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack);
static inline ULONG ThisCPU(VOID) static __inline ULONG ThisCPU(VOID)
{ {
return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
} }

14
reactos/hal/halx86/mp/apic.c
View file

@ -181,7 +181,7 @@ VOID EnableApicMode(VOID)
} }
/* Disable symetric I/O mode ie. go to PIC mode */ /* Disable symetric I/O mode ie. go to PIC mode */
inline VOID DisableSMPMode(VOID) __inline VOID DisableSMPMode(VOID)
{ {
/* /*
* Put the board back into PIC mode (has an effect * Put the board back into PIC mode (has an effect
@ -221,7 +221,7 @@ VOID APICDisable(VOID)
} }
inline ULONG _APICRead(ULONG Offset) __inline ULONG _APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
@ -230,7 +230,7 @@ inline ULONG _APICRead(ULONG Offset)
} }
#if 0 #if 0
inline VOID APICWrite(ULONG Offset, __inline VOID APICWrite(ULONG Offset,
ULONG Value) ULONG Value)
{ {
PULONG p; PULONG p;
@ -240,7 +240,7 @@ inline VOID APICWrite(ULONG Offset,
*p = Value; *p = Value;
} }
#else #else
inline VOID APICWrite(ULONG Offset, __inline VOID APICWrite(ULONG Offset,
ULONG Value) ULONG Value)
{ {
PULONG p; PULONG p;
@ -257,7 +257,7 @@ inline VOID APICWrite(ULONG Offset,
#if 0 #if 0
inline ULONG APICRead(ULONG Offset) __inline ULONG APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
@ -265,7 +265,7 @@ inline ULONG APICRead(ULONG Offset)
return *p; return *p;
} }
#else #else
inline ULONG APICRead(ULONG Offset) __inline ULONG APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;
@ -280,7 +280,7 @@ inline ULONG APICRead(ULONG Offset)
} }
#endif #endif
inline VOID APICSendEOI(VOID) __inline VOID APICSendEOI(VOID)
{ {
// Send the EOI // Send the EOI
APICWrite(APIC_EOI, 0); APICWrite(APIC_EOI, 0);

8
reactos/include/win32k/float.h
View file

@ -15,7 +15,7 @@ typedef struct tagFLOAT_POINT
* transformation process is done in floating point internally. This function * transformation process is done in floating point internally. This function
* is then used to round these coordinates to integer values. * is then used to round these coordinates to integer values.
*/ */
static inline INT GDI_ROUND(FLOAT val) static __inline INT GDI_ROUND(FLOAT val)
{ {
return (int)floor(val + 0.5); return (int)floor(val + 0.5);
} }
@ -23,7 +23,7 @@ static inline INT GDI_ROUND(FLOAT val)
/* Performs a world-to-viewport transformation on the specified point (which /* Performs a world-to-viewport transformation on the specified point (which
* is in floating point format). * is in floating point format).
*/ */
static inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point) static __inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
{ {
FLOAT x, y; FLOAT x, y;
@ -42,7 +42,7 @@ static inline void INTERNAL_LPTODP_FLOAT(DC *dc, FLOAT_POINT *point)
* is in integer format). Returns TRUE if successful, else FALSE. * is in integer format). Returns TRUE if successful, else FALSE.
*/ */
#if 0 #if 0
static inline BOOL INTERNAL_DPTOLP(DC *dc, LPPOINT point) static __inline BOOL INTERNAL_DPTOLP(DC *dc, LPPOINT point)
{ {
FLOAT_POINT floatPoint; FLOAT_POINT floatPoint;
@ -62,7 +62,7 @@ static inline BOOL INTERNAL_DPTOLP(DC *dc, LPPOINT point)
/* Performs a world-to-viewport transformation on the specified point (which /* Performs a world-to-viewport transformation on the specified point (which
* is in integer format). * is in integer format).
*/ */
static inline void INTERNAL_LPTODP(DC *dc, LPPOINT point) static __inline void INTERNAL_LPTODP(DC *dc, LPPOINT point)
{ {
FLOAT_POINT floatPoint; FLOAT_POINT floatPoint;

12
reactos/lib/adns/src/internal.h
View file

@ -690,17 +690,17 @@ void adns__consistency(adns_state ads, adns_query qu, consistency_checks cc);
/* Useful static inline functions: */ /* Useful static inline functions: */
static inline int ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; } static __inline int ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; }
static inline int ctype_digit(int c) { return c>='0' && c<='9'; } static __inline int ctype_digit(int c) { return c>='0' && c<='9'; }
static inline int ctype_alpha(int c) { static __inline int ctype_alpha(int c) {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
} }
static inline int ctype_822special(int c) { return strchr("()<>@,;:\\\".[]",c) != 0; } static __inline int ctype_822special(int c) { return strchr("()<>@,;:\\\".[]",c) != 0; }
static inline int ctype_domainunquoted(int c) { static __inline int ctype_domainunquoted(int c) {
return ctype_alpha(c) || ctype_digit(c) || (strchr("-_/+",c) != 0); return ctype_alpha(c) || ctype_digit(c) || (strchr("-_/+",c) != 0);
} }
static inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; } static __inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; }
/* Useful macros */ /* Useful macros */

2
reactos/lib/advapi32/reg/reg.c
View file

@ -52,7 +52,7 @@ static NTSTATUS OpenCurrentConfigKey(PHANDLE KeyHandle);
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
/* check if value type needs string conversion (Ansi<->Unicode) */ /* check if value type needs string conversion (Ansi<->Unicode) */
inline static int is_string( DWORD type ) __inline static int is_string( DWORD type )
{ {
return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ); return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ);
} }

2
reactos/lib/advapi32/sec/sid.c
View file

@ -70,7 +70,7 @@ static const WCHAR SDDL_AUDIT_FAILURE[] = {'F','A',0};
/* set last error code from NT status and get the proper boolean return value */ /* set last error code from NT status and get the proper boolean return value */
/* used for functions that are a simple wrapper around the corresponding ntdll API */ /* used for functions that are a simple wrapper around the corresponding ntdll API */
static inline BOOL set_ntstatus( NTSTATUS status ) static __inline BOOL set_ntstatus( NTSTATUS status )
{ {
if (status) SetLastError( RtlNtStatusToDosError( status )); if (status) SetLastError( RtlNtStatusToDosError( status ));
return !status; return !status;

4
reactos/lib/dbghelp/path.c
View file

@ -28,9 +28,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
static inline BOOL is_sep(char ch) {return ch == '/' || ch == '\\';} static __inline BOOL is_sep(char ch) {return ch == '/' || ch == '\\';}
static inline char* file_name(char* str) static __inline char* file_name(char* str)
{ {
char* p; char* p;

8
reactos/lib/dbghelp/stabs.c
View file

@ -530,7 +530,7 @@ static int stabs_pts_read_range(struct ParseTypedefData* ptd, const char* typena
return 0; return 0;
} }
static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd) static __inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd)
{ {
struct symt* dt; struct symt* dt;
char* tmp; char* tmp;
@ -570,7 +570,7 @@ static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd)
return 0; return 0;
} }
static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd, static __inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
struct symt_udt* sdt) struct symt_udt* sdt)
{ {
long sz, ofs; long sz, ofs;
@ -716,7 +716,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd,
return 0; return 0;
} }
static inline int stabs_pts_read_enum(struct ParseTypedefData* ptd, static __inline int stabs_pts_read_enum(struct ParseTypedefData* ptd,
struct symt_enum* edt) struct symt_enum* edt)
{ {
long value; long value;
@ -735,7 +735,7 @@ static inline int stabs_pts_read_enum(struct ParseTypedefData* ptd,
return 0; return 0;
} }
static inline int stabs_pts_read_array(struct ParseTypedefData* ptd, static __inline int stabs_pts_read_array(struct ParseTypedefData* ptd,
struct symt** adt) struct symt** adt)
{ {
long lo, hi; long lo, hi;

4
reactos/lib/dbghelp/stackframe.h
View file

@ -71,9 +71,9 @@ typedef struct _STACK16FRAME
#include <poppack.h> #include <poppack.h>
static inline int MapSL(int size) static __inline int MapSL(int size)
{ {
return -1; return -1;
} }
#define CURRENT_STACK16 ((STACK16FRAME*)MapSL(NtCurrentTeb()->cur_stack)) #define CURRENT_STACK16 ((STACK16FRAME*)MapSL(NtCurrentTeb()->cur_stack))

6
reactos/lib/dbghelp/symbol.c
View file

@ -54,14 +54,14 @@ struct line_info
} u; } u;
}; };
inline static int cmp_addr(ULONG64 a1, ULONG64 a2) __inline static int cmp_addr(ULONG64 a1, ULONG64 a2)
{ {
if (a1 > a2) return 1; if (a1 > a2) return 1;
if (a1 < a2) return -1; if (a1 < a2) return -1;
return 0; return 0;
} }
inline static int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr) __inline static int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr)
{ {
ULONG64 ref; ULONG64 ref;
@ -80,7 +80,7 @@ int symt_cmp_addr(const void* p1, const void* p2)
return cmp_addr(a1, a2); return cmp_addr(a1, a2);
} }
static inline void re_append(char** mask, unsigned* len, char ch) static __inline void re_append(char** mask, unsigned* len, char ch)
{ {
*mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len)); *mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len));
(*mask)[*len - 2] = ch; (*mask)[*len - 2] = ch;

4
reactos/lib/devenum/devenum_private.h
View file

@ -42,8 +42,8 @@
* Dll lifetime tracking declaration for devenum.dll * Dll lifetime tracking declaration for devenum.dll
*/ */
extern LONG dll_refs; extern LONG dll_refs;
static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } static __inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); }
static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } static __inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); }
/********************************************************************** /**********************************************************************

18
reactos/lib/kjs/include/jsint.h
View file

@ -1366,7 +1366,7 @@ JSSymbol js_vm_intern_with_len (JSVirtualMachine *vm, const char *name,
unsigned int len); unsigned int len);
/* Intern symbol <name> to virtual machine and return its JSSymbol id. */ /* Intern symbol <name> to virtual machine and return its JSSymbol id. */
static inline JSSymbol static __inline JSSymbol
js_vm_intern (JSVirtualMachine *vm, const char *name) js_vm_intern (JSVirtualMachine *vm, const char *name)
{ {
return js_vm_intern_with_len (vm, name, strlen (name)); return js_vm_intern_with_len (vm, name, strlen (name));
@ -1424,7 +1424,7 @@ void js_vm_error (JSVirtualMachine *vm);
* hash value should be re-mapped to the correct range, for example, * hash value should be re-mapped to the correct range, for example,
* with the mod operand. * with the mod operand.
*/ */
static inline unsigned int static __inline unsigned int
js_count_hash (const char *data, unsigned int data_len) js_count_hash (const char *data, unsigned int data_len)
{ {
unsigned int val = 0, i; unsigned int val = 0, i;
@ -1509,7 +1509,7 @@ int js_vm_is_marked_ptr (void *ptr);
/* Function. */ /* Function. */
static inline JSFunction * static __inline JSFunction *
js_vm_make_function (JSVirtualMachine *vm, void *implementation) js_vm_make_function (JSVirtualMachine *vm, void *implementation)
{ {
JSFunction *f = (JSFunction *) js_vm_alloc (vm, sizeof (*f)); JSFunction *f = (JSFunction *) js_vm_alloc (vm, sizeof (*f));
@ -1532,7 +1532,7 @@ void js_vm_builtin_create (JSVirtualMachine *vm, JSNode *result,
/* Array. */ /* Array. */
static inline void static __inline void
js_vm_make_array (JSVirtualMachine *vm, JSNode *n, unsigned int length) js_vm_make_array (JSVirtualMachine *vm, JSNode *n, unsigned int length)
{ {
unsigned int i; unsigned int i;
@ -1547,7 +1547,7 @@ js_vm_make_array (JSVirtualMachine *vm, JSNode *n, unsigned int length)
n->u.varray->data[i].type = JS_UNDEFINED; n->u.varray->data[i].type = JS_UNDEFINED;
} }
static inline void static __inline void
js_vm_expand_array (JSVirtualMachine *vm, JSNode *n, unsigned int length) js_vm_expand_array (JSVirtualMachine *vm, JSNode *n, unsigned int length)
{ {
if (n->u.varray->length < length) if (n->u.varray->length < length)
@ -1648,7 +1648,7 @@ void js_vm_stacktrace (JSVirtualMachine *vm, unsigned int num_frames);
/* Strings. */ /* Strings. */
static inline void static __inline void
js_vm_make_string (JSVirtualMachine *vm, JSNode *n, const char *data, js_vm_make_string (JSVirtualMachine *vm, JSNode *n, const char *data,
unsigned int data_len) unsigned int data_len)
{ {
@ -1664,7 +1664,7 @@ js_vm_make_string (JSVirtualMachine *vm, JSNode *n, const char *data,
} }
static inline void static __inline void
js_vm_make_static_string (JSVirtualMachine *vm, JSNode *n, const char *data, js_vm_make_static_string (JSVirtualMachine *vm, JSNode *n, const char *data,
unsigned int data_len) unsigned int data_len)
{ {
@ -1677,7 +1677,7 @@ js_vm_make_static_string (JSVirtualMachine *vm, JSNode *n, const char *data,
} }
static inline int static __inline int
js_compare_strings (JSNode *a, JSNode *b) js_compare_strings (JSNode *a, JSNode *b)
{ {
unsigned int i; unsigned int i;
@ -1698,7 +1698,7 @@ js_compare_strings (JSNode *a, JSNode *b)
} }
static inline char * static __inline char *
js_string_to_c_string (JSVirtualMachine *vm, const JSNode *a) js_string_to_c_string (JSVirtualMachine *vm, const JSNode *a)
{ {
char *cp; char *cp;

2
reactos/lib/kjs/ksrc/alloc.c
View file

@ -97,7 +97,7 @@ unregister_block (MemDebug *b)
} }
static inline int static __inline int
check_fail () check_fail ()
{ {
return alloc_fail != 0 && ++alloc_count >= alloc_fail; return alloc_fail != 0 && ++alloc_count >= alloc_fail;

2
reactos/lib/kjs/ksrc/main.c
View file

@ -567,7 +567,7 @@ main (int argc, char *argv[])
* Static functions. * Static functions.
*/ */
static inline int static __inline int
is_prefix (char *prefix, char *str) is_prefix (char *prefix, char *str)
{ {
int i; int i;

2
reactos/lib/kjs/src/alloc.c
View file

@ -96,7 +96,7 @@ unregister_block (MemDebug *b)
} }
static inline int static __inline int
check_fail () check_fail ()
{ {
return alloc_fail != 0 && ++alloc_count >= alloc_fail; return alloc_fail != 0 && ++alloc_count >= alloc_fail;

4
reactos/lib/kjs/src/heap.c
View file

@ -54,7 +54,7 @@
* Prototypes for static functions. * Prototypes for static functions.
*/ */
static inline unsigned int static __inline unsigned int
list (unsigned int size) list (unsigned int size)
{ {
unsigned int list = 0; unsigned int list = 0;
@ -72,7 +72,7 @@ list (unsigned int size)
} }
static inline void static __inline void
delete_destroyable (JSHeapMemoryBlock *b) delete_destroyable (JSHeapMemoryBlock *b)
{ {
JSHeapDestroyable *destroyable JSHeapDestroyable *destroyable

2
reactos/lib/kjs/src/main.c
View file

@ -596,7 +596,7 @@ main (int argc, char *argv[])
* Static functions. * Static functions.
*/ */
static inline int static __inline int
is_prefix (char *prefix, char *str) is_prefix (char *prefix, char *str)
{ {
int i; int i;

8
reactos/lib/rtl/qsort.c
View file

@ -39,10 +39,6 @@
*/ */
#include <rtl.h> #include <rtl.h>
#ifndef __GNUC__
#define inline
#endif
/* FIXME: these types should be from the default includes */ /* FIXME: these types should be from the default includes */
typedef int (* _pfunccmp_t) (const void *, const void *); typedef int (* _pfunccmp_t) (const void *, const void *);
@ -66,7 +62,7 @@ typedef int (* _pfunccmp_t) (const void *, const void *);
#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \ #define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1; es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
static inline void static __inline void
swapfunc ( swapfunc (
char * a, char * a,
char * b, char * b,
@ -90,7 +86,7 @@ swapfunc (
#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype) #define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
static inline char * static __inline char *
med3 ( med3 (
char * a, char * a,
char * b, char * b,

16
reactos/regtests/shared/regtests.h
View file

@ -76,7 +76,7 @@ FunctionName(int Command) \
#define _Dispatcher(FunctionName, TestName) \ #define _Dispatcher(FunctionName, TestName) \
_DispatcherTimeout(FunctionName, TestName, 5000) _DispatcherTimeout(FunctionName, TestName, 5000)
static inline void static __inline void
AppendAssertion(char *message) AppendAssertion(char *message)
{ {
if (strlen(_Buffer) != 0) if (strlen(_Buffer) != 0)
@ -242,7 +242,7 @@ VOID STDCALL
_Sleep(DWORD dwMilliseconds); _Sleep(DWORD dwMilliseconds);
static inline PCHAR static __inline PCHAR
FrameworkGetExportedFunctionNameInternal(_PAPI_DESCRIPTION ApiDescription) FrameworkGetExportedFunctionNameInternal(_PAPI_DESCRIPTION ApiDescription)
{ {
if (ApiDescription->ForwardedFunctionName != NULL) if (ApiDescription->ForwardedFunctionName != NULL)
@ -255,7 +255,7 @@ FrameworkGetExportedFunctionNameInternal(_PAPI_DESCRIPTION ApiDescription)
} }
} }
static inline PVOID static __inline PVOID
FrameworkGetFunction(_PAPI_DESCRIPTION ApiDescription) FrameworkGetFunction(_PAPI_DESCRIPTION ApiDescription)
{ {
HANDLE hModule; HANDLE hModule;
@ -281,7 +281,7 @@ FrameworkGetFunction(_PAPI_DESCRIPTION ApiDescription)
return function; return function;
} }
static inline PVOID static __inline PVOID
FrameworkGetHookInternal(ULONG index) FrameworkGetHookInternal(ULONG index)
{ {
PVOID address; PVOID address;
@ -316,7 +316,7 @@ FrameworkGetHookInternal(ULONG index)
} }
static inline VOID static __inline VOID
_SetHook(PCHAR name, _SetHook(PCHAR name,
PVOID address) PVOID address)
{ {
@ -340,7 +340,7 @@ typedef struct __HOOK
PVOID FunctionAddress; PVOID FunctionAddress;
} _HOOK, *_PHOOK; } _HOOK, *_PHOOK;
static inline VOID static __inline VOID
_SetHooks(_PHOOK hookTable) _SetHooks(_PHOOK hookTable)
{ {
_PHOOK hook; _PHOOK hook;
@ -354,7 +354,7 @@ _SetHooks(_PHOOK hookTable)
} }
} }
static inline VOID static __inline VOID
_UnsetHooks(_PHOOK hookTable) _UnsetHooks(_PHOOK hookTable)
{ {
_PHOOK hook; _PHOOK hook;
@ -368,7 +368,7 @@ _UnsetHooks(_PHOOK hookTable)
} }
} }
static inline VOID static __inline VOID
_UnsetAllHooks() _UnsetAllHooks()
{ {
_PAPI_DESCRIPTION api; _PAPI_DESCRIPTION api;

2
reactos/subsys/win32k/dib/dib16bpp.c
View file

@ -396,7 +396,7 @@ return TRUE;
typedef unsigned short PIXEL; typedef unsigned short PIXEL;
/* 16-bit HiColor (565 format) */ /* 16-bit HiColor (565 format) */
inline PIXEL average16(PIXEL a, PIXEL b) __inline PIXEL average16(PIXEL a, PIXEL b)
{ {
// This one doesn't work // This one doesn't work
/* /*

2
reactos/subsys/win32k/dib/dib32bpp.c
View file

@ -352,7 +352,7 @@ typedef unsigned long PIXEL;
//NOTE: If you change something here, please do the same in other dibXXbpp.c files! //NOTE: If you change something here, please do the same in other dibXXbpp.c files!
/* 32-bit Color (___ format) */ /* 32-bit Color (___ format) */
inline PIXEL average32(PIXEL a, PIXEL b) __inline PIXEL average32(PIXEL a, PIXEL b)
{ {
return a; // FIXME: Temp hack to remove "PCB-effect" from the image return a; // FIXME: Temp hack to remove "PCB-effect" from the image
} }

2
reactos/subsys/win32k/dib/dib8bpp.c
View file

@ -276,7 +276,7 @@ DIB_8BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
typedef unsigned char PIXEL; typedef unsigned char PIXEL;
/* 16-bit HiColor (565 format) */ /* 16-bit HiColor (565 format) */
inline PIXEL average8(PIXEL a, PIXEL b) __inline PIXEL average8(PIXEL a, PIXEL b)
{ {
return a; // FIXME: Depend on SetStretchMode return a; // FIXME: Depend on SetStretchMode
} }

10
reactos/subsys/win32k/eng/clip.c
View file

@ -32,7 +32,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
static inline int static __inline int
CompareRightDown(const PRECT r1, const PRECT r2) CompareRightDown(const PRECT r1, const PRECT r2)
{ {
int Cmp; int Cmp;
@ -66,7 +66,7 @@ CompareRightDown(const PRECT r1, const PRECT r2)
return Cmp; return Cmp;
} }
static inline int static __inline int
CompareRightUp(const PRECT r1, const PRECT r2) CompareRightUp(const PRECT r1, const PRECT r2)
{ {
int Cmp; int Cmp;
@ -100,7 +100,7 @@ CompareRightUp(const PRECT r1, const PRECT r2)
return Cmp; return Cmp;
} }
static inline int static __inline int
CompareLeftDown(const PRECT r1, const PRECT r2) CompareLeftDown(const PRECT r1, const PRECT r2)
{ {
int Cmp; int Cmp;
@ -134,7 +134,7 @@ CompareLeftDown(const PRECT r1, const PRECT r2)
return Cmp; return Cmp;
} }
static inline int static __inline int
CompareLeftUp(const PRECT r1, const PRECT r2) CompareLeftUp(const PRECT r1, const PRECT r2)
{ {
int Cmp; int Cmp;
@ -168,7 +168,7 @@ CompareLeftUp(const PRECT r1, const PRECT r2)
return Cmp; return Cmp;
} }
static inline int static __inline int
CompareSpans(const PSPAN Span1, const PSPAN Span2) CompareSpans(const PSPAN Span1, const PSPAN Span2)
{ {
int Cmp; int Cmp;

8
reactos/subsys/win32k/eng/xlate.c
View file

@ -32,7 +32,7 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
static inline ULONG static __inline ULONG
ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color) ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
{ {
ULONG TranslatedColor; ULONG TranslatedColor;
@ -54,7 +54,7 @@ ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
} }
static inline ULONG static __inline ULONG
ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor, ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
PALETTEENTRY *DestColors, ULONG NumColors) PALETTEENTRY *DestColors, ULONG NumColors)
{ {
@ -94,7 +94,7 @@ ClosestColorMatch(XLATEGDI *XlateGDI, LPPALETTEENTRY SourceColor,
return BestIndex; return BestIndex;
} }
static inline VOID static __inline VOID
BitMasksFromPal(USHORT PalType, PPALGDI Palette, BitMasksFromPal(USHORT PalType, PPALGDI Palette,
PULONG RedMask, PULONG BlueMask, PULONG GreenMask) PULONG RedMask, PULONG BlueMask, PULONG GreenMask)
{ {
@ -131,7 +131,7 @@ BitMasksFromPal(USHORT PalType, PPALGDI Palette,
* Calculate the number of bits Mask must be shift to the left to get a * Calculate the number of bits Mask must be shift to the left to get a
* 1 in the most significant bit position * 1 in the most significant bit position
*/ */
static inline INT static __inline INT
CalculateShift(ULONG Mask) CalculateShift(ULONG Mask)
{ {
ULONG Shift = 0; ULONG Shift = 0;

4
reactos/subsys/win32k/include/class.h
View file

@ -35,10 +35,10 @@ CleanupClassImpl(VOID);
void FASTCALL DestroyProcessClasses(PW32PROCESS Process ); void FASTCALL DestroyProcessClasses(PW32PROCESS Process );
inline VOID FASTCALL __inline VOID FASTCALL
ClassDerefObject(PWNDCLASS_OBJECT Class); ClassDerefObject(PWNDCLASS_OBJECT Class);
inline VOID FASTCALL __inline VOID FASTCALL
ClassRefObject(PWNDCLASS_OBJECT Class); ClassRefObject(PWNDCLASS_OBJECT Class);
PWNDCLASS_OBJECT FASTCALL PWNDCLASS_OBJECT FASTCALL

6
reactos/subsys/win32k/include/msgqueue.h
View file

@ -198,9 +198,9 @@ MsqIsDblClk(LPMSG Msg, BOOL Remove);
HWND FASTCALL HWND FASTCALL
MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd); MsqSetStateWindow(PUSER_MESSAGE_QUEUE MessageQueue, ULONG Type, HWND hWnd);
inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue ); __inline BOOL MsqIsSignaled( PUSER_MESSAGE_QUEUE queue );
inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); __inline VOID MsqSetQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits ); __inline VOID MsqClearQueueBits( PUSER_MESSAGE_QUEUE queue, WORD bits );
BOOL STDCALL IntInitMessagePumpHook(); BOOL STDCALL IntInitMessagePumpHook();
BOOL STDCALL IntUninitMessagePumpHook(); BOOL STDCALL IntUninitMessagePumpHook();
#define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF)) #define MAKE_LONG(x, y) ((((y) & 0xFFFF) << 16) | ((x) & 0xFFFF))

4
reactos/subsys/win32k/ntuser/class.c
View file

@ -48,7 +48,7 @@ CleanupClassImpl(VOID)
} }
inline VOID FASTCALL __inline VOID FASTCALL
ClassDerefObject(PWNDCLASS_OBJECT Class) ClassDerefObject(PWNDCLASS_OBJECT Class)
{ {
ASSERT(Class->refs >= 1); ASSERT(Class->refs >= 1);
@ -56,7 +56,7 @@ ClassDerefObject(PWNDCLASS_OBJECT Class)
} }
inline VOID FASTCALL __inline VOID FASTCALL
ClassRefObject(PWNDCLASS_OBJECT Class) ClassRefObject(PWNDCLASS_OBJECT Class)
{ {
ASSERT(Class->refs >= 0); ASSERT(Class->refs >= 0);

6
reactos/subsys/win32k/ntuser/object.c
View file

@ -45,13 +45,13 @@ PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle )
return NULL; return NULL;
} }
inline static HANDLE entry_to_handle(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY ptr ) __inline static HANDLE entry_to_handle(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY ptr )
{ {
int index = ptr - ht->handles; int index = ptr - ht->handles;
return (HANDLE)(((index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16)); return (HANDLE)(((index << 1) + FIRST_USER_HANDLE) + (ptr->generation << 16));
} }
inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht) __inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht)
{ {
PUSER_HANDLE_ENTRY entry; PUSER_HANDLE_ENTRY entry;
@ -104,7 +104,7 @@ VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes)
ht->allocated_handles = bytes / sizeof(USER_HANDLE_ENTRY); ht->allocated_handles = bytes / sizeof(USER_HANDLE_ENTRY);
} }
inline static void *free_user_entry(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY entry) __inline static void *free_user_entry(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY entry)
{ {
void *ret; void *ret;
ret = entry->ptr; ret = entry->ptr;

2
reactos/subsys/win32k/objects/bitmaps.c
View file

@ -740,7 +740,7 @@ NtGdiGetPixel(HDC hDC, INT XPos, INT YPos)
* to GDI32. I dunno. Write a test and let me know. * to GDI32. I dunno. Write a test and let me know.
*/ */
static inline BYTE static __inline BYTE
SwapROP3_SrcDst(BYTE bRop3) SwapROP3_SrcDst(BYTE bRop3)
{ {
return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1); return (bRop3 & 0x99) | ((bRop3 & 0x22) << 1) | ((bRop3 & 0x44) >> 1);

6
reactos/subsys/win32k/objects/gdiobj.c
View file

@ -156,7 +156,7 @@ GDIOBJ_iAllocHandleTable(VOID)
return handleTable; return handleTable;
} }
static inline PPAGED_LOOKASIDE_LIST static __inline PPAGED_LOOKASIDE_LIST
FindLookasideList(DWORD ObjectType) FindLookasideList(DWORD ObjectType)
{ {
int Index; int Index;
@ -174,7 +174,7 @@ FindLookasideList(DWORD ObjectType)
return NULL; return NULL;
} }
static inline BOOL static __inline BOOL
RunCleanupCallback(PGDIOBJ pObj, DWORD ObjectType) RunCleanupCallback(PGDIOBJ pObj, DWORD ObjectType)
{ {
int Index; int Index;
@ -191,7 +191,7 @@ RunCleanupCallback(PGDIOBJ pObj, DWORD ObjectType)
return TRUE; return TRUE;
} }
static inline ULONG static __inline ULONG
GetObjectSize(DWORD ObjectType) GetObjectSize(DWORD ObjectType)
{ {
int Index; int Index;

2
reactos/subsys/win32k/objects/region.c
View file

@ -402,7 +402,7 @@ typedef struct _ScanLineListBlock {
/* /*
* Check to see if there is enough memory in the present region. * Check to see if there is enough memory in the present region.
*/ */
static inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect ) { static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect ) {
if ( (reg->rdh.nCount+1)*sizeof( RECT ) >= reg->rdh.nRgnSize ) { if ( (reg->rdh.nCount+1)*sizeof( RECT ) >= reg->rdh.nRgnSize ) {
PRECT temp; PRECT temp;
temp = ExAllocatePoolWithTag( PagedPool, (2 * (reg->rdh.nRgnSize)), TAG_REGION); temp = ExAllocatePoolWithTag( PagedPool, (2 * (reg->rdh.nRgnSize)), TAG_REGION);

6
reactos/subsys/win32k/objects/text.c
View file

@ -2858,7 +2858,7 @@ GetFontScore(LOGFONTW *LogFont, PUNICODE_STRING FaceName, PFONTGDI FontGDI)
return Score; return Score;
} }
static inline VOID static __inline VOID
FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont, FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont,
PUNICODE_STRING FaceName, PLIST_ENTRY Head) PUNICODE_STRING FaceName, PLIST_ENTRY Head)
{ {
@ -2885,7 +2885,7 @@ FindBestFontFromList(FONTOBJ **FontObj, UINT *MatchScore, LOGFONTW *LogFont,
} }
} }
static inline BOOLEAN static __inline BOOLEAN
SubstituteFontFamilyKey(PUNICODE_STRING FaceName, SubstituteFontFamilyKey(PUNICODE_STRING FaceName,
LPCWSTR Key) LPCWSTR Key)
{ {
@ -2921,7 +2921,7 @@ SubstituteFontFamilyKey(PUNICODE_STRING FaceName,
return NT_SUCCESS(Status); return NT_SUCCESS(Status);
} }
static inline void static __inline void
SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level) SubstituteFontFamily(PUNICODE_STRING FaceName, UINT Level)
{ {
if (10 < Level) /* Enough is enough */ if (10 < Level) /* Enough is enough */