Janitorial: Move the storage specifier to the beginning of the declaration.

Michael Stefaniuc mstefani at redhat.de
Thu Jul 6 17:23:14 CDT 2006


The C99 spec (6.11.5) says that not doing it that way is a deprecated
feature.
---
 dlls/shell32/systray.c         |    2 +-
 dlls/wined3d/wined3d_private.h |    2 +-
 programs/explorer/systray.c    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index f4bb6ed..8439e6f 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -36,7 +36,7 @@ #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(systray);
 
-const static WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d','\0'};
+static const WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T','r','a','y','W','n','d','\0'};
 
 /*************************************************************************
  * Shell_NotifyIcon			[SHELL32.296]
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index a71539a..50b2503 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -92,7 +92,7 @@ typedef struct _WINED3DGLTYPE {
 } WINED3DGLTYPE;
 
 /* NOTE: Make sure these are in the correct numerical order. (see /include/d3d9types.h typedef enum _D3DDECLTYPE) */
-WINED3DGLTYPE static const glTypeLookup[D3DDECLTYPE_UNUSED] = {
+static WINED3DGLTYPE const glTypeLookup[D3DDECLTYPE_UNUSED] = {
                                   {D3DDECLTYPE_FLOAT1,    1, GL_FLOAT           , GL_FALSE ,sizeof(float)},
                                   {D3DDECLTYPE_FLOAT2,    2, GL_FLOAT           , GL_FALSE ,sizeof(float)},
                                   {D3DDECLTYPE_FLOAT3,    3, GL_FLOAT           , GL_FALSE ,sizeof(float)},
diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c
index 38e8ab3..70d29bf 100644
--- a/programs/explorer/systray.c
+++ b/programs/explorer/systray.c
@@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray);
 #define IS_OPTION_FALSE(ch) \
     ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0')
 
-const static WCHAR adaptor_classname[] = /* Adaptor */ {'A','d','a','p','t','o','r',0};
+static const WCHAR adaptor_classname[] = /* Adaptor */ {'A','d','a','p','t','o','r',0};
 
 /* tray state */
 struct tray
@@ -192,7 +192,7 @@ static void add_icon(const NOTIFYICONDAT
 {
     RECT rect;
     struct icon  *icon;
-    const static WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0};
+    static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0};
 
     WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd);
 
-- 
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/833e6d08/attachment.pgp


More information about the wine-patches mailing list