|
From: Andre R. <and...@us...> - 2006-03-04 22:58:46
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16470/Common/source Modified Files: filemp3.c langdll.c menu.c popup.c shellfile.c Log Message: Fixed most Visual Studio .NET 2003 compiler warnings. Index: popup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/popup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** popup.c 11 Jan 2005 22:48:10 -0000 1.3 --- popup.c 4 Mar 2006 22:58:40 -0000 1.4 *************** *** 86,89 **** --- 86,91 ---- Point pt; + + #ifdef MACVERSION short idmenu; short iditem; *************** *** 91,94 **** --- 93,97 ---- long commandid; hdlmenu hchosenmenu; + #endif setcursortype (cursorisarrow); /*arrow cursor is more appropriate here*/ Index: langdll.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdll.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** langdll.c 8 Feb 2006 19:42:22 -0000 1.7 --- langdll.c 4 Mar 2006 22:58:40 -0000 1.8 *************** *** 1100,1106 **** */ - tyfilespec fs = (**hdll).fs; - #ifdef MACVERSION short resfile; Handle hRes; --- 1100,1105 ---- */ #ifdef MACVERSION + tyfilespec fs = (**hdll).fs; short resfile; Handle hRes; *************** *** 1453,1457 **** if (stricmp (stringbaseaddress(fn), "COMDLL.DLL") == 0) { ! (**hdll).hdllsyshandle = COMStartup(); /*** FIXME: make sure we deal properly with the COM DLL ***/ return ((**hdll).hdllsyshandle != nil); --- 1452,1456 ---- if (stricmp (stringbaseaddress(fn), "COMDLL.DLL") == 0) { ! (**hdll).hdllsyshandle = (tydllsyshandle) COMStartup(); /*** FIXME: make sure we deal properly with the COM DLL ***/ return ((**hdll).hdllsyshandle != nil); *************** *** 1511,1515 **** #if (FRONTIERCOM == 1) ! if ((**hdll).hdllsyshandle == COMSYSModule()) /*** FIXME: make sure we deal properly with the COM DLL ***/ COMShutdown(); else --- 1510,1514 ---- #if (FRONTIERCOM == 1) ! if ((**hdll).hdllsyshandle == (tydllsyshandle) COMSYSModule()) /*** FIXME: make sure we deal properly with the COM DLL ***/ COMShutdown(); else Index: filemp3.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filemp3.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** filemp3.c 8 Feb 2006 20:31:36 -0000 1.5 --- filemp3.c 4 Mar 2006 22:58:40 -0000 1.6 *************** *** 369,373 **** ix += sizeof(long); ! if (flags & 0x00000001 == 0) //check for frame count return (false); --- 369,373 ---- ix += sizeof(long); ! if ((flags & 0x00000001) == 0) //check for frame count return (false); Index: menu.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** menu.c 19 Feb 2006 16:43:30 -0000 1.7 --- menu.c 4 Mar 2006 22:58:40 -0000 1.8 *************** *** 816,820 **** GetMenuItemInfo (menubar, idmenu, false, &info); ! return (info.fState | MFS_ENABLED != 0); #endif } /*getmenuitemenable*/ --- 816,820 ---- GetMenuItemInfo (menubar, idmenu, false, &info); ! return ((info.fState | MFS_ENABLED) != 0); #endif } /*getmenuitemenable*/ *************** *** 845,849 **** GetMenuItemInfo (hmenu, item - 1, true, &info); ! return (info.fState | MFS_ENABLED != 0); #endif } /*getmenuitemenable*/ --- 845,849 ---- GetMenuItemInfo (hmenu, item - 1, true, &info); ! return ((info.fState | MFS_ENABLED) != 0); #endif } /*getmenuitemenable*/ Index: shellfile.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellfile.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shellfile.c 7 Oct 2005 04:07:42 -0000 1.7 --- shellfile.c 4 Mar 2006 22:58:40 -0000 1.8 *************** *** 150,155 **** OSType filetype; tyfindvisitinfo info; bigstring bsext; ! if (wnew != nil) *wnew = nil; --- 150,157 ---- OSType filetype; tyfindvisitinfo info; + #ifdef MACVERSION bigstring bsext; ! #endif ! if (wnew != nil) *wnew = nil; *************** *** 170,180 **** return (false); ! #ifdef MACVERSION ! ! lastword (fspec->name, '.', bsext); ! if (equalidentifiers (bsext, "\proot")) ! filetype = 'TABL'; ! #endif if (!shellpushdefaultglobals ()) --- 172,182 ---- return (false); ! #ifdef MACVERSION ! lastword (fspec->name, '.', bsext); ! ! if (equalidentifiers (bsext, "\proot")) ! filetype = 'TABL'; ! #endif if (!shellpushdefaultglobals ()) |