include: Replace inline static with static inline
Andrew Talbot
Andrew.Talbot at talbotville.com
Fri Mar 23 10:12:17 CDT 2007
Changelog:
include: Replace inline static with static inline.
diff -urN a/include/vfw.h b/include/vfw.h
--- a/include/vfw.h 2006-05-23 13:49:04.000000000 +0100
+++ b/include/vfw.h 2007-03-23 13:40:03.000000000 +0000
@@ -387,7 +387,7 @@
LRESULT VFWAPI ICSendMessage(HIC hic, UINT msg, DWORD_PTR dw1, DWORD_PTR dw2);
-inline static LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressEx(HIC hic, DWORD dwFlags,
LPBITMAPINFOHEADER lpbiSrc, LPVOID lpSrc,
int xSrc, int ySrc, int dxSrc, int dySrc,
LPBITMAPINFOHEADER lpbiDst, LPVOID lpDst,
@@ -411,7 +411,7 @@
return ICSendMessage(hic, ICM_DECOMPRESSEX, (DWORD_PTR)&ic, sizeof(ic));
}
-inline static LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressExBegin(HIC hic, DWORD dwFlags,
LPBITMAPINFOHEADER lpbiSrc,
LPVOID lpSrc,
int xSrc, int ySrc, int dxSrc, int dySrc,
@@ -439,7 +439,7 @@
ic.dyDst = dyDst;
return ICSendMessage(hic, ICM_DECOMPRESSEX_BEGIN, (DWORD_PTR)&ic, sizeof(ic));
}
-inline static LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags,
+static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags,
LPBITMAPINFOHEADER lpbiSrc,
LPVOID lpSrc,
int xSrc, int ySrc, int dxSrc, int dySrc,
@@ -519,14 +519,14 @@
#define ICGetStateSize(hic) \
ICGetState(hic, NULL, 0)
-inline static DWORD ICGetDefaultQuality(HIC hic)
+static inline DWORD ICGetDefaultQuality(HIC hic)
{
DWORD dwICValue;
ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD));
return dwICValue;
}
-inline static DWORD ICGetDefaultKeyFrameRate(HIC hic)
+static inline DWORD ICGetDefaultKeyFrameRate(HIC hic)
{
DWORD dwICValue;
ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD_PTR)(LPVOID)&dwICValue, sizeof(DWORD));
@@ -609,7 +609,7 @@
DWORD VFWAPIV ICDraw(HIC hic,DWORD dwFlags,LPVOID lpFormat,LPVOID lpData,DWORD cbData,LONG lTime);
-inline static LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn,
+static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpbiIn,
LPBITMAPINFOHEADER lpbiOut,
int dxSrc, int dySrc,
int dxDst, int dyDst,
@@ -666,7 +666,7 @@
#define ICDrawRenderBuffer(hic) \
ICSendMessage(hic, ICM_DRAW_RENDERBUFFER, 0, 0)
-inline static LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam,
+static inline LRESULT VFWAPI ICSetStatusProc(HIC hic, DWORD dwFlags, LRESULT lParam,
LONG (CALLBACK *fpfnStatus)(LPARAM, UINT, LONG))
{
ICSETSTATUSPROC ic;
diff -urN a/include/wincon.h b/include/wincon.h
--- a/include/wincon.h 2006-05-23 13:49:05.000000000 +0100
+++ b/include/wincon.h 2007-03-23 13:40:03.000000000 +0000
@@ -176,7 +176,7 @@
* structures is different between Windows and gcc on i386. */
DWORD WINAPI GetLargestConsoleWindowSize(HANDLE);
-inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h)
+static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h)
{
union {
COORD c;
diff -urN a/include/win.h b/include/win.h
--- a/include/win.h 2006-10-05 11:04:09.000000000 +0100
+++ b/include/win.h 2007-03-23 13:40:03.000000000 +0000
@@ -90,14 +90,14 @@
extern void USER_Lock(void);
extern void USER_Unlock(void);
-inline static HWND WIN_GetFullHandle( HWND hwnd )
+static inline HWND WIN_GetFullHandle( HWND hwnd )
{
if (!HIWORD(hwnd) && hwnd) hwnd = WIN_Handle32( LOWORD(hwnd) );
return hwnd;
}
/* to release pointers retrieved by WIN_GetPtr */
-inline static void WIN_ReleasePtr( WND *ptr )
+static inline void WIN_ReleasePtr( WND *ptr )
{
USER_Unlock();
}
diff -urN a/include/winsock.h b/include/winsock.h
--- a/include/winsock.h 2006-12-03 13:31:05.000000000 +0000
+++ b/include/winsock.h 2007-03-23 13:40:03.000000000 +0000
@@ -523,11 +523,11 @@
#else /* WORDS_BIGENDIAN */
-inline static u_short __wine_ushort_swap(u_short s)
+static inline u_short __wine_ushort_swap(u_short s)
{
return (s >> 8) | (s << 8);
}
-inline static u_long __wine_ulong_swap(u_long l)
+static inline u_long __wine_ulong_swap(u_long l)
{
return ((u_long)__wine_ushort_swap((u_short)l) << 16) | __wine_ushort_swap((u_short)(l >> 16));
}
diff -urN a/include/winternl.h b/include/winternl.h
--- a/include/winternl.h 2007-03-12 17:35:07.000000000 +0000
+++ b/include/winternl.h 2007-03-23 13:40:03.000000000 +0000
@@ -2278,7 +2278,7 @@
#define RtlRetrieveUlonglong(p,s) memcpy((p), (s), sizeof(ULONGLONG))
#define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length))
-inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit)
+static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit)
{
if (lpBits && ulBit < lpBits->SizeOfBitMap &&
lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31)))
@@ -2287,11 +2287,11 @@
}
/* These are implemented as __fastcall, so we can't let Winelib apps link with them */
-inline static USHORT RtlUshortByteSwap(USHORT s)
+static inline USHORT RtlUshortByteSwap(USHORT s)
{
return (s >> 8) | (s << 8);
}
-inline static ULONG RtlUlongByteSwap(ULONG i)
+static inline ULONG RtlUlongByteSwap(ULONG i)
{
#if defined(__i386__) && defined(__GNUC__)
ULONG ret;
More information about the wine-patches
mailing list