setupapi: Replace inline static with static inline
Andrew Talbot
Andrew.Talbot at talbotville.com
Mon Mar 19 14:48:48 CDT 2007
Changelog:
setupapi: Replace inline static with static inline.
diff -urN a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
--- a/dlls/setupapi/parser.c 2006-10-20 18:08:05.000000000 +0100
+++ b/dlls/setupapi/parser.c 2007-03-19 19:15:16.000000000 +0000
@@ -256,7 +256,7 @@
/* retrieve a given line from section/line index */
-inline static struct line *get_line( struct inf_file *file, unsigned int section_index,
+static inline struct line *get_line( struct inf_file *file, unsigned int section_index,
unsigned int line_index )
{
struct section *section;
@@ -444,7 +444,7 @@
/* push the current state on the parser stack */
-inline static void push_state( struct parser *parser, enum parser_state state )
+static inline void push_state( struct parser *parser, enum parser_state state )
{
assert( parser->stack_pos < sizeof(parser->stack)/sizeof(parser->stack[0]) );
parser->stack[parser->stack_pos++] = state;
@@ -452,7 +452,7 @@
/* pop the current state */
-inline static void pop_state( struct parser *parser )
+static inline void pop_state( struct parser *parser )
{
assert( parser->stack_pos );
parser->state = parser->stack[--parser->stack_pos];
@@ -460,7 +460,7 @@
/* set the parser state and return the previous one */
-inline static enum parser_state set_state( struct parser *parser, enum parser_state state )
+static inline enum parser_state set_state( struct parser *parser, enum parser_state state )
{
enum parser_state ret = parser->state;
parser->state = state;
@@ -469,14 +469,14 @@
/* check if the pointer points to an end of file */
-inline static int is_eof( struct parser *parser, const WCHAR *ptr )
+static inline int is_eof( struct parser *parser, const WCHAR *ptr )
{
return (ptr >= parser->end || *ptr == CONTROL_Z);
}
/* check if the pointer points to an end of line */
-inline static int is_eol( struct parser *parser, const WCHAR *ptr )
+static inline int is_eol( struct parser *parser, const WCHAR *ptr )
{
return (ptr >= parser->end || *ptr == CONTROL_Z || *ptr == '\n');
}
diff -urN a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
--- a/dlls/setupapi/queue.c 2006-11-14 17:52:06.000000000 +0000
+++ b/dlls/setupapi/queue.c 2007-03-19 19:15:16.000000000 +0000
@@ -73,7 +73,7 @@
};
-inline static WCHAR *strdupW( const WCHAR *str )
+static inline WCHAR *strdupW( const WCHAR *str )
{
WCHAR *ret = NULL;
if (str)
@@ -84,7 +84,7 @@
return ret;
}
-inline static char *strdupWtoA( const WCHAR *str )
+static inline char *strdupWtoA( const WCHAR *str )
{
char *ret = NULL;
if (str)
@@ -97,7 +97,7 @@
}
/* append a file operation to a queue */
-inline static void queue_file_op( struct file_op_queue *queue, struct file_op *op )
+static inline void queue_file_op( struct file_op_queue *queue, struct file_op *op )
{
op->next = NULL;
if (queue->tail) queue->tail->next = op;
diff -urN a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
--- a/dlls/setupapi/setupapi_private.h 2006-11-14 17:52:06.000000000 +0000
+++ b/dlls/setupapi/setupapi_private.h 2007-03-19 19:15:16.000000000 +0000
@@ -29,7 +29,7 @@
#define REGPART_RENAME "\\Rename"
#define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager"
-inline static WCHAR *strdupAtoW( const char *str )
+static inline WCHAR *strdupAtoW( const char *str )
{
WCHAR *ret = NULL;
if (str)
More information about the wine-patches
mailing list