wineps.drv: Replace inline static with static inline

Andrew Talbot Andrew.Talbot at talbotville.com
Sat Mar 17 05:43:46 CDT 2007


Changelog:
    wineps.drv: Replace inline static with static inline.

diff -urN a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c
--- a/dlls/wineps.drv/afm2c.c	2006-05-23 17:05:52.000000000 +0100
+++ b/dlls/wineps.drv/afm2c.c	2007-03-17 10:42:32.000000000 +0000
@@ -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 -urN a/dlls/wineps.drv/afm.c b/dlls/wineps.drv/afm.c
--- a/dlls/wineps.drv/afm.c	2006-05-23 17:05:52.000000000 +0100
+++ b/dlls/wineps.drv/afm.c	2007-03-17 10:42:32.000000000 +0000
@@ -197,7 +197,7 @@
  *  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 -urN a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c
--- a/dlls/wineps.drv/bitmap.c	2006-10-13 11:27:20.000000000 +0100
+++ b/dlls/wineps.drv/bitmap.c	2007-03-17 10:42:32.000000000 +0000
@@ -29,7 +29,7 @@
 
 
 /* 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 -urN a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c
--- a/dlls/wineps.drv/builtin.c	2006-10-13 11:27:20.000000000 +0100
+++ b/dlls/wineps.drv/builtin.c	2007-03-17 10:42:32.000000000 +0000
@@ -38,7 +38,7 @@
 /***********************************************************************
  *           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 @@
  *  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 -urN a/dlls/wineps.drv/glyphlist.c b/dlls/wineps.drv/glyphlist.c
--- a/dlls/wineps.drv/glyphlist.c	2007-03-12 17:34:02.000000000 +0000
+++ b/dlls/wineps.drv/glyphlist.c	2007-03-17 10:42:32.000000000 +0000
@@ -73,7 +73,7 @@
  *  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 -urN a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c
--- a/dlls/wineps.drv/mkagl.c	2007-02-06 17:51:12.000000000 +0000
+++ b/dlls/wineps.drv/mkagl.c	2007-03-17 10:42:32.000000000 +0000
@@ -55,17 +55,17 @@
     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 @@
  *  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 @@
  *  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 -urN a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c
--- a/dlls/wineps.drv/truetype.c	2006-05-23 17:05:53.000000000 +0100
+++ b/dlls/wineps.drv/truetype.c	2007-03-17 10:42:32.000000000 +0000
@@ -279,7 +279,7 @@
  *  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 -urN a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c
--- a/dlls/wineps.drv/type1afm.c	2006-05-23 17:05:53.000000000 +0100
+++ b/dlls/wineps.drv/type1afm.c	2007-03-17 10:42:32.000000000 +0000
@@ -190,7 +190,7 @@
  *  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 @@
  *  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 @@
     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) ||



More information about the wine-patches mailing list