Janitorial: Put "inline static" at the beginning of a declaration.
Michael Stefaniuc
mstefani at redhat.de
Thu Jul 6 17:26:16 CDT 2006
gcc -Wextra complains about inline and static not being at the beginning
of the declaration. The C99 standard is not explicit that the function
specifier should be the first declaration specifier even before the storage
class specifier. Though there is one mention of that:
6.7 Declarations
Semantics
The declaration specifiers consist of a sequence of specifiers that indicate
the linkage, storage duration, and part of the type of the entities that the
declarators denote.
---
dlls/comctl32/trackbar.c | 52 ++++++++++++++++++++++----------------------
dlls/mlang/tests/mlang.c | 4 ++-
dlls/msg711.acm/msg711.c | 2 +-
dlls/rpcrt4/ndr_marshall.c | 2 +-
dlls/user/driver16.c | 2 +-
dlls/wined3d/drawprim.c | 4 ++-
dlls/winex11.drv/wintab.c | 2 +-
dlls/winmm/driver.c | 2 +-
dlls/wintab32/context.c | 4 ++-
9 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index aecde79..1acccc4 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -237,7 +237,7 @@ TRACKBAR_GetAutoPageDirection (TRACKBAR_
return 0;
}
-static void inline
+inline static void
TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
@@ -249,7 +249,7 @@ TRACKBAR_PageDown (TRACKBAR_INFO *infoPt
}
-static void inline
+inline static void
TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
@@ -260,7 +260,7 @@ TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
notify_with_scroll (infoPtr, TB_PAGEUP);
}
-static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
+inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMin) return;
infoPtr->lPos -= infoPtr->lLineSize;
@@ -269,7 +269,7 @@ static void inline TRACKBAR_LineUp(TRACK
notify_with_scroll (infoPtr, TB_LINEUP);
}
-static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
+inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
{
if (infoPtr->lPos == infoPtr->lRangeMax) return;
infoPtr->lPos += infoPtr->lLineSize;
@@ -404,7 +404,7 @@ TRACKBAR_InvalidateThumbMove (TRACKBAR_I
TRACKBAR_InvalidateThumb (infoPtr, newPos);
}
-static BOOL inline
+inline static BOOL
TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr)
{
return infoPtr->lSelMin != infoPtr->lSelMax;
@@ -757,7 +757,7 @@ TRACKBAR_DrawThumb(TRACKBAR_INFO *infoPt
}
-static void inline
+inline static void
TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow)
{
TTTOOLINFOW ti;
@@ -1022,7 +1022,7 @@ TRACKBAR_ClearTics (TRACKBAR_INFO *infoP
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
{
if (lprc == NULL) return 0;
@@ -1036,7 +1036,7 @@ TRACKBAR_GetChannelRect (TRACKBAR_INFO *
}
-static LONG inline
+inline static LONG
TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
@@ -1058,7 +1058,7 @@ static int comp_tics(const void *ap, con
}
-static LONG inline
+inline static LONG
TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
{
if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics)
@@ -1069,7 +1069,7 @@ TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr,
}
-static LONG inline
+inline static LONG
TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic)
{
LONG range, width, pos, tic;
@@ -1111,7 +1111,7 @@ TRACKBAR_SetBuddy (TRACKBAR_INFO *infoPt
}
-static LONG inline
+inline static LONG
TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
{
LONG lTemp = infoPtr->lLineSize;
@@ -1122,7 +1122,7 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *inf
}
-static LONG inline
+inline static LONG
TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
{
LONG lTemp = infoPtr->lPageSize;
@@ -1133,7 +1133,7 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *inf
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition)
{
LONG oldPos = infoPtr->lPos;
@@ -1152,7 +1152,7 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr,
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
{
infoPtr->lRangeMin = (SHORT)LOWORD(lRange);
@@ -1177,7 +1177,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPt
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMax)
{
infoPtr->lRangeMax = lMax;
@@ -1195,7 +1195,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *inf
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lMin)
{
infoPtr->lRangeMin = lMin;
@@ -1213,7 +1213,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *inf
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1234,7 +1234,7 @@ TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr,
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1252,7 +1252,7 @@ TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoP
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lStart)
{
if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_ENABLESELRANGE)
@@ -1270,7 +1270,7 @@ TRACKBAR_SetSelStart (TRACKBAR_INFO *inf
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_FIXEDLENGTH) {
@@ -1283,7 +1283,7 @@ TRACKBAR_SetThumbLength (TRACKBAR_INFO *
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS)
@@ -1310,7 +1310,7 @@ TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr,
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
{
if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_AUTOTICKS) {
@@ -1323,7 +1323,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *info
}
-static INT inline
+inline static INT
TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
{
INT fTemp = infoPtr->fLocation;
@@ -1334,7 +1334,7 @@ TRACKBAR_SetTipSide (TRACKBAR_INFO *info
}
-static LRESULT inline
+inline static LRESULT
TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
{
infoPtr->hwndToolTip = hwndTT;
@@ -1343,7 +1343,7 @@ TRACKBAR_SetToolTips (TRACKBAR_INFO *inf
}
-static BOOL inline
+inline static BOOL
TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode)
{
BOOL bTemp = infoPtr->bUnicode;
@@ -1702,7 +1702,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr
}
-static BOOL inline
+inline static BOOL
TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
{
switch (nVirtKey) {
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index a8abb81..a272a7a 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -211,7 +211,7 @@ static void test_multibyte_to_unicode_tr
ok(lenA == expected_len, "expected lenA %u, got %u\n", expected_len, lenA);
}
-static void inline cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2)
+inline static void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2)
{
ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08lx != %08lx\n", cpinfo1->dwFlags, cpinfo2->dwFlags);
ok(cpinfo1->uiCodePage == cpinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", cpinfo1->uiCodePage, cpinfo2->uiCodePage);
@@ -487,7 +487,7 @@ #endif
IEnumCodePage_Release(iEnumCP);
}
-static void inline scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2)
+inline static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2)
{
ok(sinfo1->ScriptId == sinfo2->ScriptId, "ScriptId mismatch: %d != %d\n", sinfo1->ScriptId, sinfo2->ScriptId);
ok(sinfo1->uiCodePage == sinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", sinfo1->uiCodePage, sinfo2->uiCodePage);
diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c
index 10ae7f7..1c24781 100644
--- a/dlls/msg711.acm/msg711.c
+++ b/dlls/msg711.acm/msg711.c
@@ -391,7 +391,7 @@ static unsigned short _a2l[] = {
0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250,
0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350,
};
-static int inline
+inline static int
alaw2linear(unsigned char a_val)
{
return (short)_a2l[a_val];
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 6e51eaf..1a3f401 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -529,7 +529,7 @@ finish_conf:
/* multiply two numbers together, raising an RPC_S_INVALID_BOUND exception if
* the result overflows 32-bits */
-static ULONG inline safe_multiply(ULONG a, ULONG b)
+inline static ULONG safe_multiply(ULONG a, ULONG b)
{
ULONGLONG ret = (ULONGLONG)a * b;
if (ret > 0xffffffff)
diff --git a/dlls/user/driver16.c b/dlls/user/driver16.c
index 8bc4ecd..5c93294 100644
--- a/dlls/user/driver16.c
+++ b/dlls/user/driver16.c
@@ -116,7 +116,7 @@ static LPWINE_DRIVER DRIVER_FindFromHDrv
/**************************************************************************
* DRIVER_SendMessage [internal]
*/
-static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
+inline static LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg,
LPARAM lParam1, LPARAM lParam2)
{
WORD args[8];
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index f81b23d..075fe9b 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1860,7 +1860,7 @@ void drawStridedSoftwareVS(IWineD3DDevic
#endif
-static inline void drawPrimitiveDrawStrided(
+inline static void drawPrimitiveDrawStrided(
IWineD3DDevice *iface,
BOOL useVertexShaderFunction,
BOOL usePixelShaderFunction,
@@ -2011,7 +2011,7 @@ #undef BUFFER_OR_DATA
glDisable(GL_FRAGMENT_PROGRAM_ARB);
}
-void inline drawPrimitiveTraceDataLocations(WineDirect3DVertexStridedData *dataLocations,DWORD fvf) {
+inline void drawPrimitiveTraceDataLocations(WineDirect3DVertexStridedData *dataLocations,DWORD fvf) {
/* Dump out what parts we have supplied */
TRACE("Strided Data (from FVF/VS): %lx\n", fvf);
diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index 6bf0409..f56bf08 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -757,7 +757,7 @@ int X11DRV_GetCurrentPacket(LPWTPACKET *
}
-int static inline CopyTabletData(LPVOID target, LPVOID src, INT size)
+inline static int CopyTabletData(LPVOID target, LPVOID src, INT size)
{
/*
* It is valid to call CopyTabletData with NULL.
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 7838e84..5cab620 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -131,7 +131,7 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR
/**************************************************************************
* DRIVER_SendMessage [internal]
*/
-static LRESULT inline DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg,
+inline static LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg,
LPARAM lParam1, LPARAM lParam2)
{
LRESULT ret = 0;
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index d33765c..8fa544d 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -236,12 +236,12 @@ LPOPENCONTEXT AddPacketToContextQueue(LP
/*
* Flushes all packets from the queue.
*/
-static void inline TABLET_FlushQueue(LPOPENCONTEXT context)
+inline static void TABLET_FlushQueue(LPOPENCONTEXT context)
{
context->PacketsQueued = 0;
}
-int static inline CopyTabletData(LPVOID target, LPVOID src, INT size)
+inline static int CopyTabletData(LPVOID target, LPVOID src, INT size)
{
memcpy(target,src,size);
return(size);
--
1.4.0
--
Michael Stefaniuc Tel.: +49-711-96437-199
Sr. Network Engineer Fax.: +49-711-96437-111
Red Hat GmbH Email: mstefani at redhat.com
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20060707/e3760e6e/attachment.pgp
More information about the wine-patches
mailing list