From a89d5de5dfc885a5b875866a4f6058cf9547ce9e Mon Sep 17 00:00:00 2001
From: Andrew Talbot <Andrew.Talbot@talbotville.com>
Date: Mon, 19 Mar 2007 19:48:48 +0000
Subject: [PATCH] setupapi: Replace inline static with static inline.

---
 dlls/setupapi/parser.c           | 12 ++++++------
 dlls/setupapi/queue.c            |  6 +++---
 dlls/setupapi/setupapi_private.h |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 3c2c7ad9ee3..3ebb86a880d 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -256,7 +256,7 @@ static struct line *add_line( struct inf_file *file, int section_index )
 
 
 /* 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 @@ static WCHAR *push_string( struct inf_file *file, const WCHAR *string )
 
 
 /* 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 @@ inline static void push_state( struct parser *parser, enum parser_state state )
 
 
 /* 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 @@ inline static void pop_state( struct parser *parser )
 
 
 /* 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 @@ inline static enum parser_state set_state( struct parser *parser, enum parser_st
 
 
 /* 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 --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index 26522e68613..063e8c04299 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -73,7 +73,7 @@ struct file_queue
 };
 
 
-inline static WCHAR *strdupW( const WCHAR *str )
+static inline WCHAR *strdupW( const WCHAR *str )
 {
     WCHAR *ret = NULL;
     if (str)
@@ -84,7 +84,7 @@ inline static WCHAR *strdupW( const WCHAR *str )
     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 @@ inline static char *strdupWtoA( const WCHAR *str )
 }
 
 /* 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 --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
index ed9a7bfff29..32f1661e247 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -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)