Rename keyword variable
Andreas Mohr
andi at rhlx01.fht-esslingen.de
Mon Sep 13 06:11:35 CDT 2004
Hi,
"template" is a keyword on c++, so better rename it to menu_template.
Andreas Mohr
-------------- next part --------------
Index: dlls/user/menu.c
===================================================================
RCS file: /home/wine/wine/dlls/user/menu.c,v
retrieving revision 1.2
diff -u -r1.2 menu.c
--- dlls/user/menu.c 10 Sep 2004 22:29:32 -0000 1.2
+++ dlls/user/menu.c 13 Sep 2004 11:08:52 -0000
@@ -3882,13 +3882,13 @@
/**********************************************************************
* LoadMenuIndirect (USER.220)
*/
-HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template )
+HMENU16 WINAPI LoadMenuIndirect16( LPCVOID menu_template )
{
HMENU hMenu;
WORD version, offset;
- LPCSTR p = (LPCSTR)template;
+ LPCSTR p = (LPCSTR)menu_template;
- TRACE("(%p)\n", template );
+ TRACE("(%p)\n", menu_template );
version = GET_WORD(p);
p += sizeof(WORD);
if (version)
@@ -3911,15 +3911,15 @@
/**********************************************************************
* LoadMenuIndirectW (USER32.@)
*/
-HMENU WINAPI LoadMenuIndirectW( LPCVOID template )
+HMENU WINAPI LoadMenuIndirectW( LPCVOID menu_template )
{
HMENU hMenu;
WORD version, offset;
- LPCSTR p = (LPCSTR)template;
+ LPCSTR p = (LPCSTR)menu_template;
version = GET_WORD(p);
p += sizeof(WORD);
- TRACE("%p, ver %d\n", template, version );
+ TRACE("%p, ver %d\n", menu_template, version );
switch (version)
{
case 0: /* standard format is version of 0 */
@@ -3952,9 +3952,9 @@
/**********************************************************************
* LoadMenuIndirectA (USER32.@)
*/
-HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
+HMENU WINAPI LoadMenuIndirectA( LPCVOID menu_template )
{
- return LoadMenuIndirectW( template );
+ return LoadMenuIndirectW( menu_template );
}
@@ -4160,7 +4160,7 @@
menu->fType |= MF_POPUP;
}
else
- /* FIXME: Return an error ? */
+ /* FIXME: Return an error? */
menu->fType &= ~MF_POPUP;
}
else
More information about the wine-patches
mailing list