Andrew Talbot : winebuild: Replace inline static with static inline.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Mar 17 14:35:29 CDT 2007


Module: wine
Branch: master
Commit: 5df3ff13e7a44d2822c9c8962c163929fed74269
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5df3ff13e7a44d2822c9c8962c163929fed74269

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Sat Mar 17 10:54:52 2007 +0000

winebuild: Replace inline static with static inline.

---

 tools/winebuild/import.c |   12 ++++++------
 tools/winebuild/parser.c |    4 ++--
 tools/winebuild/res16.c  |    2 +-
 tools/winebuild/res32.c  |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
index 80c6c12..c6a1e1b 100644
--- a/tools/winebuild/import.c
+++ b/tools/winebuild/import.c
@@ -97,7 +97,7 @@ static int func_cmp( const void *func1, const void *func2 )
 }
 
 /* add a name to a name table */
-inline static void add_name( struct name_table *table, const char *name )
+static inline void add_name( struct name_table *table, const char *name )
 {
     if (table->count == table->size)
     {
@@ -109,7 +109,7 @@ inline static void add_name( struct name_table *table, const char *name )
 }
 
 /* remove a name from a name table */
-inline static void remove_name( struct name_table *table, unsigned int idx )
+static inline void remove_name( struct name_table *table, unsigned int idx )
 {
     assert( idx < table->count );
     free( table->names[idx] );
@@ -119,7 +119,7 @@ inline static void remove_name( struct name_table *table, unsigned int idx )
 }
 
 /* make a name table empty */
-inline static void empty_name_table( struct name_table *table )
+static inline void empty_name_table( struct name_table *table )
 {
     unsigned int i;
 
@@ -128,7 +128,7 @@ inline static void empty_name_table( struct name_table *table )
 }
 
 /* locate a name in a (sorted) list */
-inline static const char *find_name( const char *name, const struct name_table *table )
+static inline const char *find_name( const char *name, const struct name_table *table )
 {
     char **res = NULL;
 
@@ -137,13 +137,13 @@ inline static const char *find_name( const char *name, const struct name_table *
 }
 
 /* sort a name table */
-inline static void sort_names( struct name_table *table )
+static inline void sort_names( struct name_table *table )
 {
     if (table->count) qsort( table->names, table->count, sizeof(*table->names), name_cmp );
 }
 
 /* locate an export in a (sorted) export list */
-inline static ORDDEF *find_export( const char *name, ORDDEF **table, int size )
+static inline ORDDEF *find_export( const char *name, ORDDEF **table, int size )
 {
     ORDDEF func, *odp, **res = NULL;
 
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 3e0c400..9246fd2 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -79,12 +79,12 @@ static int IsNumberString(const char *s)
     return 1;
 }
 
-inline static int is_token_separator( char ch )
+static inline int is_token_separator( char ch )
 {
     return strchr( separator_chars, ch ) != NULL;
 }
 
-inline static int is_token_comment( char ch )
+static inline int is_token_comment( char ch )
 {
     return strchr( comment_chars, ch ) != NULL;
 }
diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c
index 99e5cd3..35ac597 100644
--- a/tools/winebuild/res16.c
+++ b/tools/winebuild/res16.c
@@ -79,7 +79,7 @@ static const unsigned char *file_end;   /* end of resource file */
 static const char *file_name;  /* current resource file name */
 
 
-inline static struct resource *add_resource( DLLSPEC *spec )
+static inline struct resource *add_resource( DLLSPEC *spec )
 {
     spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(*spec->resources) );
     return &spec->resources[spec->nb_resources++];
diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c
index 0c01542..5d480ad 100644
--- a/tools/winebuild/res32.c
+++ b/tools/winebuild/res32.c
@@ -93,7 +93,7 @@ static const char *file_name;  /* current resource file name */
 #define RESDIR_SIZE(n)  (sizeof(IMAGE_RESOURCE_DIRECTORY) + (n) * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY))
 
 
-inline static struct resource *add_resource( DLLSPEC *spec )
+static inline struct resource *add_resource( DLLSPEC *spec )
 {
     spec->resources = xrealloc( spec->resources, (spec->nb_resources + 1) * sizeof(spec->resources[0]) );
     return &spec->resources[spec->nb_resources++];




More information about the wine-cvs mailing list