|
From: Andre R. <and...@us...> - 2004-10-30 20:50:03
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26010 Modified Files: wpverbs.c wpengine.c Log Message: Fix GCC compiler warnings. Index: wpverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wpverbs.c 23 Oct 2004 23:07:43 -0000 1.2 --- wpverbs.c 30 Oct 2004 20:49:51 -0000 1.3 *************** *** 174,178 **** #endif ! static errornum = 0; /*error number exclusively for wp routines*/ --- 174,178 ---- #endif ! static short errornum = 0; /*error number exclusively for wp routines*/ *************** *** 516,520 **** register hdlwpvariable hv = (hdlwpvariable) h; - register boolean flpacked = (**hv).flpacked; register hdlwprecord hwp; register boolean fl; --- 516,519 ---- *************** *** 806,809 **** --- 805,810 ---- + #if 0 + static boolean getwpparam (hdltreenode hfirst, short pnum, hdlwpvariable *hv) { *************** *** 840,843 **** --- 841,846 ---- } /*getwpparam*/ + #endif + boolean wpwindowopen (hdlexternalvariable hvariable, hdlwindowinfo *hinfo) { *************** *** 1812,1816 **** boolean flwindowopen; hdlwindowinfo hinfo; - boolean flfromtop = true; fltempload = !(**hv).flinmemory; --- 1815,1818 ---- *************** *** 1910,1919 **** ! static boolean wpverbgetvariable (hdlexternalvariable *hvariable) { if (wpdata == nil) return (false); ! *hvariable = (hdlexternalvariable) (**wpdata).wprefcon; return (true); --- 1912,1923 ---- ! static boolean wpverbgetvariable (void *hvariable) { ! ! hdlexternalvariable *hv = (hdlexternalvariable *) hvariable; if (wpdata == nil) return (false); ! *hv = (hdlexternalvariable) (**wpdata).wprefcon; return (true); *************** *** 1921,1930 **** - static boolean wpverbgetwpdata (void) { - - return (true); - } /*wpverbgetwpdata*/ - - static boolean wpverbgettargetdata (short id) { --- 1925,1928 ---- Index: wpengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wpengine.c 23 Oct 2004 23:07:16 -0000 1.2 --- wpengine.c 30 Oct 2004 20:49:51 -0000 1.3 *************** *** 93,97 **** // static Handle hlastundodata = nil; ! static boolean fldestroycaret = false; /*7.0b16 PBS: global for destroying caret in main thread on Windows.*/ --- 93,99 ---- // static Handle hlastundodata = nil; ! #ifdef WIN95VERSION ! static boolean fldestroycaret = false; /*7.0b16 PBS: global for destroying caret in main thread on Windows.*/ ! #endif *************** *** 1379,1382 **** --- 1381,1386 ---- + #if 0 + static boolean wpfilterstyles (Handle htext, pg_ref pg, boolean redraw) { *************** *** 1395,1398 **** --- 1399,1404 ---- } /*wpfilterstyles*/ + #endif + boolean wpmeasuretext (Handle htext, Rect *r, tywpflags wpflags) { *************** *** 4502,4507 **** */ - hdlwprecord wp = wpdata; - if (wpsetglobals ()) { --- 4508,4511 ---- |