Module: wine Branch: master Commit: 41c0cc8f9c14ea71e20aee93ee0c0ac1ab69f5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c0cc8f9c14ea71e20aee93ee...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Sat Mar 17 10:43:46 2007 +0000
wineps.drv: Replace inline static with static inline.
---
dlls/wineps.drv/afm.c | 2 +- dlls/wineps.drv/afm2c.c | 2 +- dlls/wineps.drv/bitmap.c | 2 +- dlls/wineps.drv/builtin.c | 4 ++-- dlls/wineps.drv/glyphlist.c | 2 +- dlls/wineps.drv/mkagl.c | 10 +++++----- dlls/wineps.drv/truetype.c | 2 +- dlls/wineps.drv/type1afm.c | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c index f283956..5c9278a 100644 --- a/dlls/wineps.drv/afm.c +++ b/dlls/wineps.drv/afm.c @@ -197,7 +197,7 @@ static void PSDRV_DumpFontList(void) * Tries to use formula in TrueType specification; falls back to simple mean * if any lowercase latin letter (or space) is not present. */ -inline static SHORT MeanCharWidth(const AFM *afm) +static inline SHORT MeanCharWidth(const AFM *afm) { float w = 0.0; int i; diff --git a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c index 5d81b95..3f8b0ce 100644 --- a/dlls/wineps.drv/afm2c.c +++ b/dlls/wineps.drv/afm2c.c @@ -53,7 +53,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
-inline static void cursorto(FILE *of, int np, int cp) +static inline void cursorto(FILE *of, int np, int cp) { int ntp = np & 0xfffffff8; int ctp = cp & 0xfffffff8; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 8307891..fd02383 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
/* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ -inline static int get_dib_width_bytes( int width, int depth ) +static inline int get_dib_width_bytes( int width, int depth ) { int words;
diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index cc36f84..e156433 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * is_stock_font */ -inline static BOOL is_stock_font( HFONT font ) +static inline BOOL is_stock_font( HFONT font ) { int i; for (i = OEM_FIXED_FONT; i <= DEFAULT_GUI_FONT; i++) @@ -55,7 +55,7 @@ inline static BOOL is_stock_font( HFONT font ) * Scale builtin font to requested lfHeight * */ -inline static float Round(float f) +static inline float Round(float f) { return (f > 0) ? (f + 0.5) : (f - 0.5); } diff --git a/dlls/wineps.drv/glyphlist.c b/dlls/wineps.drv/glyphlist.c index eeb1716..f8d1c83 100644 --- a/dlls/wineps.drv/glyphlist.c +++ b/dlls/wineps.drv/glyphlist.c @@ -73,7 +73,7 @@ INT PSDRV_GlyphListInit(void) * list if necessary; returns index on success (-1 on failure) * */ -inline static INT GlyphListInsert(LPCSTR szName, INT index) +static inline INT GlyphListInsert(LPCSTR szName, INT index) { GLYPHNAME *g;
diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index 6c6e508..9701621 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -55,17 +55,17 @@ static int cmp_by_name(const void *a, const void *b) return strcmp(((const GLYPHINFO *)a)->name, ((const GLYPHINFO *)b)->name); }
-inline static void sort_by_UV() +static inline void sort_by_UV() { qsort(glyphs, num_glyphs, sizeof(GLYPHINFO), cmp_by_UV); }
-inline static void sort_by_name() +static inline void sort_by_name() { qsort(glyphs, num_glyphs, sizeof(GLYPHINFO), cmp_by_name); }
-inline static GLYPHINFO *search_by_name(const char *name) +static inline GLYPHINFO *search_by_name(const char *name) { GLYPHINFO gi;
@@ -80,7 +80,7 @@ inline static GLYPHINFO *search_by_name(const char *name) * Use the 'optimal' combination of tabs and spaces to position the cursor */
-inline static void fcpto(FILE *f, int newpos, int curpos) +static inline void fcpto(FILE *f, int newpos, int curpos) { int newtpos = newpos & ~7; int curtpos = curpos & ~7; @@ -103,7 +103,7 @@ inline static void fcpto(FILE *f, int newpos, int curpos) * Make main() look "purty" */
-inline static void triple_space(FILE *f) +static inline void triple_space(FILE *f) { fputc('\n', f); fputc('\n', f); } diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 1f91d1d..913bf21 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -279,7 +279,7 @@ static BOOL FindMSTTString(FT_Face face, FT_CharMap charmap, FT_UShort name_id, * units. * */ -inline static float PSUnits(LONG x, USHORT em_size) +static inline float PSUnits(LONG x, USHORT em_size) { return 1000.0 * (float)x / (float)em_size; } diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 40892ea..ad8c16a 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -190,7 +190,7 @@ static BOOL FindLine(FILE *file, CHAR buffer[], INT bufsize, LPCSTR key) * Linux x86/gcc). * */ -inline static BOOL DoubleToFloat(float *p_f, double d) +static inline BOOL DoubleToFloat(float *p_f, double d) { if (d > (double)FLT_MAX || d < -(double)FLT_MAX) return FALSE; @@ -205,7 +205,7 @@ inline static BOOL DoubleToFloat(float *p_f, double d) * Utility function to add or subtract 0.5 before converting to integer type. * */ -inline static float Round(float f) +static inline float Round(float f) { return (f >= 0.0) ? (f + 0.5) : (f - 0.5); } @@ -819,7 +819,7 @@ static int cmpUV(const void *a, const void *b) return (int)(*((const LONG *)a) - *((const LONG *)b)); }
-inline static BOOL IsWinANSI(LONG uv) +static inline BOOL IsWinANSI(LONG uv) { if ((0x0020 <= uv && uv <= 0x007e) || (0x00a0 <= uv && uv <= 0x00ff) || (0x2018 <= uv && uv <= 0x201a) || (0x201c <= uv && uv <= 0x201e) ||