From 2832c55881d8f6562f5c3f079078a0c184d8ff8e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 9 Jul 2009 21:22:22 +0000 Subject: [PATCH] 2009-07-09 23:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbvmpub.h * include/extend.api * include/hbwince.h * include/hb_io.h * include/hbdefs.h * include/hbsetup.h * include/hbinit.h * include/clipdefs.h * include/hbmath.h * include/hbzlib.h * include/hbregex.h * include/hbexprb.c * source/pp/hbpp.c * source/lang/msgrukoi.c * source/lang/msgzhgb.c * source/lang/msgruwin.c * source/lang/msgelwin.c * source/lang/msgro.c * source/lang/msghriso.c * source/lang/msgcskam.c * source/lang/msggl.c * source/lang/msges.c * source/lang/msgde.c * source/lang/msgru866.c * source/lang/msgcs852.c * source/lang/msgplmaz.c * source/lang/msgpliso.c * source/lang/msgplwin.c * source/lang/msgid.c * source/lang/msgel.c * source/lang/msgdewin.c * source/lang/msghr437.c * source/lang/msghr852.c * source/lang/msgcsiso.c * source/lang/msgcswin.c * source/lang/msgeswin.c * source/vm/macro.c * source/vm/mainwin.c * source/vm/maindll.c * source/vm/itemapi.c * source/vm/hvm.c * source/vm/cmdarg.c * source/vm/mainstd.c * source/vm/maindllp.c * source/vm/fm.c * source/vm/extrap.c * source/vm/thread.c * source/vm/main.c * source/vm/break.c * source/vm/dynlibhb.c * source/vm/set.c * source/vm/classes.c * source/debug/dbgtwin.prg * source/debug/dbgtmenu.prg * source/debug/dbgmenu.prg * source/debug/dbgthsh.prg * source/debug/dbgwa.prg * source/common/hbgete.c * source/common/hbver.c * source/common/hbprintf.c * source/common/hbfsapi.c * source/common/hbverdsp.c * source/common/hbwince.c * source/common/hbfopen.c * source/common/hbdate.c * source/macro/macroa.c * source/macro/macrob.c * source/rtl/lennum.c * source/rtl/gtdos/gtdos.c * source/rtl/setposbs.c * source/rtl/gtwin/gtwin.c * source/rtl/typefile.prg * source/rtl/math.c * source/rtl/getsys53.prg * source/rtl/tobject.prg * source/rtl/gtcrs/gtcrs.c * source/rtl/gtcrs/gtcrs.h * source/rtl/philesx.c * source/rtl/filehb.c * source/rtl/hbtoken.c * source/rtl/fstemp.c * source/rtl/ampm.c * source/rtl/maxrow.c * source/rtl/hbstrfmt.c * source/rtl/transfrm.c * source/rtl/gttone.c * source/rtl/datec.c * source/rtl/fserr.c * source/rtl/pushbtn.prg * source/rtl/memvarbl.prg * source/rtl/hbregexc.c * source/rtl/profiler.prg * source/rtl/hbini.prg * source/rtl/dbedit.prg * source/rtl/filesys.c * source/rtl/lang.c * source/rtl/einstv52.prg * source/rtl/hbbit.c * source/rtl/isprint.c * source/rtl/altd.prg * source/rtl/diskspac.c * source/rtl/console.c * source/rtl/gtos2/gtos2.c * source/rtl/adir.prg * source/rtl/gui.prg * source/rtl/hbgtcore.c * source/rtl/dirdrive.c * source/rtl/wait.prg * source/rtl/mlcfunc.c * source/rtl/scrollbr.prg * source/rtl/gtapiu.c * source/rtl/tbrowsys.prg * source/rtl/oemansi.c * source/rtl/philes53.c * source/rtl/color53.prg * source/rtl/xsavescr.c * source/rtl/tgetlist.prg * source/rtl/gtsln/mousesln.c * source/rtl/gtsln/kbsln.c * source/rtl/gtsln/gtsln.h * source/rtl/disksphb.c * source/rtl/tlabel.prg * source/rtl/radiogrp.prg * source/rtl/scrrow.c * source/rtl/net.c * source/rtl/stuff.c * source/rtl/checkbox.prg * source/rtl/filebuf.c * source/rtl/mtran.c * source/rtl/gete.c * source/rtl/hbproces.c * source/rtl/gtwvt/gtwvt.c * source/rtl/fssize.c * source/rtl/memofile.c * source/rtl/hbffind.c * source/rtl/tmenuitm.prg * source/rtl/gtsys.c * source/rtl/devoutp.prg * source/codepage/uckoi8.c * source/codepage/uckoi8u.c * source/codepage/cphu852s.c * source/codepage/cpes850c.c * source/codepage/cphuisos.c * source/codepage/ucmaz.c * source/codepage/cptr857.c * source/codepage/ucmik.c * source/codepage/cphr437.c * source/codepage/cphuwins.c * source/rdd/dbjoin.prg * source/rdd/dbnubs.c * source/rdd/dbfuncs.prg * source/rdd/dbtotal.prg * source/rdd/dbstrux.prg * source/rdd/dbsort.prg * source/rdd/dbfcdx/dbfcdx1.c * source/rdd/hbsix/sxcompr.c * source/compiler/hbmain.c * source/compiler/expropta.c * source/compiler/exproptb.c * source/compiler/fixflex.c * source/compiler/compi18n.c * source/compiler/gencobj.c * source/compiler/hbopt.c * source/compiler/hbgenerr.c * utils/hbtest/rt_main.h * utils/hbtest/rt_main.ch * utils/hbtest/rt_trans.prg * utils/hbtest/rt_misc.prg * utils/hbtest/rt_vars.ch * contrib/gtalleg/gtalleg.c * contrib/gtalleg/ssf.h * contrib/hbmysql/mysqlold.c * contrib/hbmysql/mysql.c * contrib/hbct/charlist.c * contrib/hbct/ctnet.c * contrib/hbct/charonly.c * contrib/hbct/ctset.c * contrib/hbct/ctset.h * contrib/hbct/cterror.ch * contrib/hbct/ftoc.c * contrib/hbct/charevod.c * contrib/hbct/exponent.c * contrib/hbct/dattime3.c * contrib/hbct/ct.prg * contrib/hbct/cursor.c * contrib/hbct/color.c * contrib/hbct/charone.c * contrib/hbct/numconv.prg * contrib/hbct/cttime.prg * contrib/hbct/ctstr.h * contrib/hbct/atnum.c * contrib/hbct/disk.c * contrib/hbct/misc1.c * contrib/hbct/print.c * contrib/xhb/hblog.ch * contrib/xhb/bkgtsks.c * contrib/xhb/wintypes.ch * contrib/xhb/classex.ch * contrib/xhb/hbcomprs.c * contrib/xhb/ttable.ch * contrib/xhb/hbcompat.ch * contrib/xhb/arrayblk.prg * contrib/xhb/hbctypes.ch * contrib/xhb/xhbextrn.ch * contrib/xhb/filestat.c * contrib/xhb/hblogdef.ch * contrib/xhb/xhbcopyf.c * contrib/xhb/hbserv.c * contrib/xhb/xhbfunc.c * contrib/hbodbc/odbcold.c * contrib/hbtpathy/telepath.ch * contrib/hbmzip/hbmzip.c * contrib/hbblat/hbblat.ch * contrib/hbxbp/xbpfiledialog.prg * contrib/hbxbp/gra.ch * contrib/hbxbp/xbpwindow.prg * contrib/hbxbp/xbp.ch * contrib/hbxbp/xbphtmlviewer.prg * contrib/hbxbp/xbptoolbar.prg * contrib/hbxbp/appevent.ch * contrib/hbxbp/xbpgeneric.prg * contrib/xpp/philesx.c * contrib/hbnf/acctyear.prg * contrib/hbnf/byteneg.prg * contrib/hbnf/isshare.prg * contrib/hbnf/kspeed.c * contrib/hbnf/prtscr.c * contrib/hbnf/ftshadow.c * contrib/hbnf/descendn.c * contrib/hbnf/scancode.prg * contrib/hbnf/vidmode.prg * contrib/hbnf/acctadj.prg * contrib/hbnf/vidcur.prg * contrib/hbnf/iamidle.c * contrib/hbnf/acctmnth.prg * contrib/hbnf/madd.prg * contrib/hbnf/fttext.c * contrib/hbnf/mouse1.prg * contrib/hbnf/settime.prg * contrib/hbnf/page.prg * contrib/hbnf/setkeys.c * contrib/hbnf/month.prg * contrib/hbnf/acctweek.prg * contrib/hbnf/acctqtr.prg * contrib/hbnf/dosver.prg * contrib/hbnf/metaph.prg * contrib/hbnf/menu1.prg * contrib/hbnf/byteand.prg * contrib/hbnf/bytexor.prg * contrib/hbnf/byteor.prg * contrib/hbnf/asum.prg * contrib/hbnf/wda.prg * contrib/hbnf/aavg.prg * contrib/hbnf/mouse.c * contrib/hbnf/setdate.prg * contrib/hbnf/amedian.prg * contrib/hbnf/blink.prg * contrib/hbnf/getvid.c * contrib/hbnf/getver.c * contrib/hbnf/nwuid.prg * contrib/hbnf/aemaxlen.prg * contrib/hbnf/bitset.prg * contrib/hbnf/nwlstat.prg * contrib/hbnf/tempfile.prg * contrib/hbnf/diskfunc.prg * contrib/hbnf/d2e.prg * contrib/hbnf/mouse2.prg * contrib/hbnf/firstday.prg * contrib/hbnf/menutonf.prg * contrib/hbnf/pvid.prg * contrib/hbnf/isbit.prg * contrib/hbnf/datecnfg.prg * contrib/hbnf/putkey.c * contrib/hbnf/getenvrn.c * contrib/hbnf/bytenot.prg * contrib/hbnf/aeminlen.prg * contrib/hbnf/year.prg * contrib/hbnf/ftmenuto.ch * contrib/hbnf/rmdir.c * contrib/hbnf/sysmem.prg * contrib/hbnf/bitclr.prg * contrib/hbnf/setlastk.c * contrib/hbnf/clrsel.prg * contrib/hbcurl/hbcurl.ch * contrib/gtwvg/gtwvg.c * contrib/gtwvg/wvgax.prg * contrib/gtwvg/gtwvg.h * contrib/gtwvg/wvggui.c * contrib/gtwvg/wvggui.h * contrib/gtwvg/wvgwin.c * contrib/gtwvg/wvgutils.c * contrib/gtwvg/wvgcore.c * contrib/gtwvg/wvgtabpg.prg * contrib/gtwvg/wvgsink.c * contrib/gtwvg/wvgwing.c * contrib/hbclipsm/num.c * contrib/hbclipsm/stack.c * contrib/rddads/rddads.h * contrib/rddads/ads1.c * contrib/hbfimage/fi_winfu.c * contrib/hbfimage/fi_wrp.c * contrib/hbgd/gd.ch * contrib/hbgd/gdchart.prg * contrib/hbgd/gdimage.prg * contrib/hbgd/gdwrp.c * contrib/hbmisc/nconvert.prg * contrib/hbmisc/stringsx.c * contrib/hbmisc/spd.c * contrib/hbmisc/stringp.prg * contrib/hbwin/win_prn2.c * contrib/hbwin/wapi_commctrl.c * contrib/hbwin/wapi_winbase.c * contrib/hbwin/wapi_winuser.c * contrib/hbwin/hbwinole.h * contrib/hbwin/win_dll.c * contrib/hbwin/axfunc.prg * contrib/hbwin/win_prn1.c * contrib/hbvpdf/hbvpdf.ch * examples/hboleold/win_ole.c * Formatting: - Removing EOL whitespaces. - Removing extra empty lines at EOF. - Adding EOL at EOF if missing. (except in foreign code) --- harbour/ChangeLog | 326 ++++++++++++++++++++++++ harbour/contrib/gtalleg/gtalleg.c | 8 +- harbour/contrib/gtalleg/ssf.h | 18 +- harbour/contrib/gtwvg/gtwvg.c | 20 +- harbour/contrib/gtwvg/gtwvg.h | 14 +- harbour/contrib/gtwvg/wvgax.prg | 1 - harbour/contrib/gtwvg/wvgcore.c | 94 +++---- harbour/contrib/gtwvg/wvggui.c | 4 +- harbour/contrib/gtwvg/wvggui.h | 16 +- harbour/contrib/gtwvg/wvgsink.c | 2 +- harbour/contrib/gtwvg/wvgtabpg.prg | 2 +- harbour/contrib/gtwvg/wvgutils.c | 8 +- harbour/contrib/gtwvg/wvgwin.c | 4 +- harbour/contrib/gtwvg/wvgwing.c | 6 +- harbour/contrib/hbblat/hbblat.ch | 2 +- harbour/contrib/hbclipsm/num.c | 2 +- harbour/contrib/hbclipsm/stack.c | 2 +- harbour/contrib/hbct/atnum.c | 2 +- harbour/contrib/hbct/charevod.c | 2 +- harbour/contrib/hbct/charlist.c | 6 +- harbour/contrib/hbct/charone.c | 4 +- harbour/contrib/hbct/charonly.c | 2 +- harbour/contrib/hbct/color.c | 20 +- harbour/contrib/hbct/ct.prg | 14 +- harbour/contrib/hbct/cterror.ch | 44 ++-- harbour/contrib/hbct/ctnet.c | 4 +- harbour/contrib/hbct/ctset.c | 1 - harbour/contrib/hbct/ctset.h | 2 +- harbour/contrib/hbct/ctstr.h | 2 +- harbour/contrib/hbct/cttime.prg | 2 +- harbour/contrib/hbct/cursor.c | 4 +- harbour/contrib/hbct/dattime3.c | 6 +- harbour/contrib/hbct/disk.c | 14 +- harbour/contrib/hbct/exponent.c | 4 +- harbour/contrib/hbct/ftoc.c | 4 +- harbour/contrib/hbct/misc1.c | 2 +- harbour/contrib/hbct/numconv.prg | 6 +- harbour/contrib/hbct/print.c | 4 +- harbour/contrib/hbcurl/hbcurl.ch | 10 +- harbour/contrib/hbfimage/fi_winfu.c | 6 +- harbour/contrib/hbfimage/fi_wrp.c | 2 +- harbour/contrib/hbgd/gd.ch | 2 +- harbour/contrib/hbgd/gdchart.prg | 1 - harbour/contrib/hbgd/gdimage.prg | 1 - harbour/contrib/hbgd/gdwrp.c | 6 +- harbour/contrib/hbmisc/nconvert.prg | 4 +- harbour/contrib/hbmisc/spd.c | 2 +- harbour/contrib/hbmisc/stringp.prg | 3 - harbour/contrib/hbmisc/stringsx.c | 2 +- harbour/contrib/hbmysql/mysql.c | 2 +- harbour/contrib/hbmysql/mysqlold.c | 2 +- harbour/contrib/hbmzip/hbmzip.c | 6 +- harbour/contrib/hbnf/aavg.prg | 2 +- harbour/contrib/hbnf/acctadj.prg | 12 +- harbour/contrib/hbnf/acctmnth.prg | 20 +- harbour/contrib/hbnf/acctqtr.prg | 20 +- harbour/contrib/hbnf/acctweek.prg | 15 +- harbour/contrib/hbnf/acctyear.prg | 16 +- harbour/contrib/hbnf/aemaxlen.prg | 1 - harbour/contrib/hbnf/aeminlen.prg | 1 - harbour/contrib/hbnf/amedian.prg | 1 - harbour/contrib/hbnf/asum.prg | 1 - harbour/contrib/hbnf/bitclr.prg | 1 - harbour/contrib/hbnf/bitset.prg | 1 - harbour/contrib/hbnf/blink.prg | 1 - harbour/contrib/hbnf/byteand.prg | 1 - harbour/contrib/hbnf/byteneg.prg | 1 - harbour/contrib/hbnf/bytenot.prg | 1 - harbour/contrib/hbnf/byteor.prg | 1 - harbour/contrib/hbnf/bytexor.prg | 1 - harbour/contrib/hbnf/clrsel.prg | 5 +- harbour/contrib/hbnf/d2e.prg | 1 - harbour/contrib/hbnf/datecnfg.prg | 1 - harbour/contrib/hbnf/descendn.c | 2 +- harbour/contrib/hbnf/diskfunc.prg | 1 - harbour/contrib/hbnf/dosver.prg | 1 - harbour/contrib/hbnf/firstday.prg | 1 - harbour/contrib/hbnf/ftmenuto.ch | 1 - harbour/contrib/hbnf/ftshadow.c | 6 +- harbour/contrib/hbnf/fttext.c | 2 +- harbour/contrib/hbnf/getenvrn.c | 10 +- harbour/contrib/hbnf/getver.c | 14 +- harbour/contrib/hbnf/getvid.c | 6 +- harbour/contrib/hbnf/iamidle.c | 4 +- harbour/contrib/hbnf/isbit.prg | 1 - harbour/contrib/hbnf/isshare.prg | 1 - harbour/contrib/hbnf/kspeed.c | 6 +- harbour/contrib/hbnf/madd.prg | 1 - harbour/contrib/hbnf/menu1.prg | 2 +- harbour/contrib/hbnf/menutonf.prg | 2 - harbour/contrib/hbnf/metaph.prg | 1 - harbour/contrib/hbnf/month.prg | 1 - harbour/contrib/hbnf/mouse.c | 48 ++-- harbour/contrib/hbnf/mouse1.prg | 11 +- harbour/contrib/hbnf/mouse2.prg | 1 - harbour/contrib/hbnf/nwlstat.prg | 1 - harbour/contrib/hbnf/nwuid.prg | 3 - harbour/contrib/hbnf/page.prg | 2 - harbour/contrib/hbnf/prtscr.c | 4 +- harbour/contrib/hbnf/putkey.c | 2 +- harbour/contrib/hbnf/pvid.prg | 2 - harbour/contrib/hbnf/rmdir.c | 2 +- harbour/contrib/hbnf/scancode.prg | 1 - harbour/contrib/hbnf/setdate.prg | 1 - harbour/contrib/hbnf/setkeys.c | 2 +- harbour/contrib/hbnf/setlastk.c | 2 +- harbour/contrib/hbnf/settime.prg | 1 - harbour/contrib/hbnf/sysmem.prg | 1 - harbour/contrib/hbnf/tempfile.prg | 1 - harbour/contrib/hbnf/vidcur.prg | 1 - harbour/contrib/hbnf/vidmode.prg | 3 +- harbour/contrib/hbnf/wda.prg | 2 - harbour/contrib/hbnf/year.prg | 1 - harbour/contrib/hbodbc/odbcold.c | 2 +- harbour/contrib/hbtpathy/telepath.ch | 2 +- harbour/contrib/hbvpdf/hbvpdf.ch | 1 - harbour/contrib/hbwin/axfunc.prg | 2 +- harbour/contrib/hbwin/hbwinole.h | 2 +- harbour/contrib/hbwin/wapi_commctrl.c | 10 +- harbour/contrib/hbwin/wapi_winbase.c | 4 +- harbour/contrib/hbwin/wapi_winuser.c | 8 +- harbour/contrib/hbwin/win_dll.c | 16 +- harbour/contrib/hbwin/win_prn1.c | 2 +- harbour/contrib/hbwin/win_prn2.c | 6 +- harbour/contrib/hbxbp/appevent.ch | 2 - harbour/contrib/hbxbp/gra.ch | 7 - harbour/contrib/hbxbp/xbp.ch | 1 - harbour/contrib/hbxbp/xbpfiledialog.prg | 1 - harbour/contrib/hbxbp/xbpgeneric.prg | 1 - harbour/contrib/hbxbp/xbphtmlviewer.prg | 1 - harbour/contrib/hbxbp/xbptoolbar.prg | 1 - harbour/contrib/hbxbp/xbpwindow.prg | 1 - harbour/contrib/rddads/ads1.c | 2 +- harbour/contrib/rddads/rddads.h | 16 +- harbour/contrib/xhb/arrayblk.prg | 1 - harbour/contrib/xhb/bkgtsks.c | 4 +- harbour/contrib/xhb/classex.ch | 1 - harbour/contrib/xhb/filestat.c | 2 +- harbour/contrib/xhb/hbcompat.ch | 8 +- harbour/contrib/xhb/hbcomprs.c | 9 +- harbour/contrib/xhb/hbctypes.ch | 2 +- harbour/contrib/xhb/hblog.ch | 1 - harbour/contrib/xhb/hblogdef.ch | 3 +- harbour/contrib/xhb/hbserv.c | 20 +- harbour/contrib/xhb/ttable.ch | 2 +- harbour/contrib/xhb/wintypes.ch | 2 +- harbour/contrib/xhb/xhbcopyf.c | 6 +- harbour/contrib/xhb/xhbextrn.ch | 2 +- harbour/contrib/xhb/xhbfunc.c | 4 +- harbour/contrib/xpp/philesx.c | 2 +- harbour/examples/hboleold/win_ole.c | 4 +- harbour/include/clipdefs.h | 4 +- harbour/include/extend.api | 6 +- harbour/include/hb_io.h | 10 +- harbour/include/hbdefs.h | 50 ++-- harbour/include/hbexprb.c | 13 +- harbour/include/hbinit.h | 30 +-- harbour/include/hbmath.h | 24 +- harbour/include/hbregex.h | 4 +- harbour/include/hbsetup.h | 198 +++++++------- harbour/include/hbvmpub.h | 4 +- harbour/include/hbwince.h | 10 +- harbour/include/hbzlib.h | 2 +- harbour/source/codepage/cpes850c.c | 4 +- harbour/source/codepage/cphr437.c | 2 +- harbour/source/codepage/cphu852s.c | 12 +- harbour/source/codepage/cphuisos.c | 12 +- harbour/source/codepage/cphuwins.c | 12 +- harbour/source/codepage/cptr857.c | 12 +- harbour/source/codepage/uckoi8.c | 2 +- harbour/source/codepage/uckoi8u.c | 2 +- harbour/source/codepage/ucmaz.c | 2 +- harbour/source/codepage/ucmik.c | 2 +- harbour/source/common/hbdate.c | 6 +- harbour/source/common/hbfopen.c | 2 +- harbour/source/common/hbfsapi.c | 6 +- harbour/source/common/hbgete.c | 10 +- harbour/source/common/hbprintf.c | 12 +- harbour/source/common/hbver.c | 78 +++--- harbour/source/common/hbverdsp.c | 2 +- harbour/source/common/hbwince.c | 8 +- harbour/source/compiler/compi18n.c | 4 +- harbour/source/compiler/expropta.c | 2 +- harbour/source/compiler/exproptb.c | 2 +- harbour/source/compiler/fixflex.c | 6 +- harbour/source/compiler/gencobj.c | 6 +- harbour/source/compiler/hbgenerr.c | 2 +- harbour/source/compiler/hbmain.c | 4 +- harbour/source/compiler/hbopt.c | 76 +++--- harbour/source/debug/dbgmenu.prg | 8 +- harbour/source/debug/dbgthsh.prg | 6 +- harbour/source/debug/dbgtmenu.prg | 4 +- harbour/source/debug/dbgtwin.prg | 2 +- harbour/source/debug/dbgwa.prg | 2 +- harbour/source/lang/msgcs852.c | 11 +- harbour/source/lang/msgcsiso.c | 11 +- harbour/source/lang/msgcskam.c | 11 +- harbour/source/lang/msgcswin.c | 10 +- harbour/source/lang/msgde.c | 11 +- harbour/source/lang/msgdewin.c | 11 +- harbour/source/lang/msgel.c | 10 +- harbour/source/lang/msgelwin.c | 10 +- harbour/source/lang/msges.c | 11 +- harbour/source/lang/msgeswin.c | 10 +- harbour/source/lang/msggl.c | 1 - harbour/source/lang/msghr437.c | 1 - harbour/source/lang/msghr852.c | 11 +- harbour/source/lang/msghriso.c | 1 - harbour/source/lang/msgid.c | 1 - harbour/source/lang/msgpliso.c | 1 - harbour/source/lang/msgplmaz.c | 1 - harbour/source/lang/msgplwin.c | 1 - harbour/source/lang/msgro.c | 1 - harbour/source/lang/msgru866.c | 1 - harbour/source/lang/msgrukoi.c | 1 - harbour/source/lang/msgruwin.c | 1 - harbour/source/lang/msgzhgb.c | 2 +- harbour/source/macro/macroa.c | 2 +- harbour/source/macro/macrob.c | 2 +- harbour/source/pp/hbpp.c | 6 +- harbour/source/rdd/dbfcdx/dbfcdx1.c | 4 +- harbour/source/rdd/dbfuncs.prg | 6 +- harbour/source/rdd/dbjoin.prg | 10 +- harbour/source/rdd/dbnubs.c | 3 +- harbour/source/rdd/dbsort.prg | 2 +- harbour/source/rdd/dbstrux.prg | 4 +- harbour/source/rdd/dbtotal.prg | 4 +- harbour/source/rdd/hbsix/sxcompr.c | 2 +- harbour/source/rtl/adir.prg | 1 - harbour/source/rtl/altd.prg | 2 +- harbour/source/rtl/ampm.c | 1 - harbour/source/rtl/checkbox.prg | 16 +- harbour/source/rtl/color53.prg | 2 +- harbour/source/rtl/console.c | 4 +- harbour/source/rtl/datec.c | 2 +- harbour/source/rtl/dbedit.prg | 26 +- harbour/source/rtl/devoutp.prg | 2 +- harbour/source/rtl/dirdrive.c | 2 +- harbour/source/rtl/diskspac.c | 18 +- harbour/source/rtl/disksphb.c | 18 +- harbour/source/rtl/einstv52.prg | 2 +- harbour/source/rtl/filebuf.c | 2 +- harbour/source/rtl/filehb.c | 2 +- harbour/source/rtl/filesys.c | 250 +++++++++--------- harbour/source/rtl/fserr.c | 12 +- harbour/source/rtl/fssize.c | 4 +- harbour/source/rtl/fstemp.c | 12 +- harbour/source/rtl/gete.c | 4 +- harbour/source/rtl/getsys53.prg | 4 +- harbour/source/rtl/gtapiu.c | 1 - harbour/source/rtl/gtcrs/gtcrs.c | 6 +- harbour/source/rtl/gtcrs/gtcrs.h | 2 +- harbour/source/rtl/gtdos/gtdos.c | 86 +++---- harbour/source/rtl/gtos2/gtos2.c | 2 +- harbour/source/rtl/gtsln/gtsln.h | 4 +- harbour/source/rtl/gtsln/kbsln.c | 48 ++-- harbour/source/rtl/gtsln/mousesln.c | 14 +- harbour/source/rtl/gtsys.c | 12 +- harbour/source/rtl/gttone.c | 12 +- harbour/source/rtl/gtwin/gtwin.c | 10 +- harbour/source/rtl/gtwvt/gtwvt.c | 22 +- harbour/source/rtl/gui.prg | 6 +- harbour/source/rtl/hbbit.c | 6 +- harbour/source/rtl/hbffind.c | 58 ++--- harbour/source/rtl/hbgtcore.c | 12 +- harbour/source/rtl/hbini.prg | 2 +- harbour/source/rtl/hbproces.c | 4 +- harbour/source/rtl/hbregexc.c | 2 +- harbour/source/rtl/hbstrfmt.c | 8 +- harbour/source/rtl/hbtoken.c | 4 +- harbour/source/rtl/isprint.c | 4 +- harbour/source/rtl/lang.c | 2 +- harbour/source/rtl/lennum.c | 1 - harbour/source/rtl/math.c | 28 +- harbour/source/rtl/maxrow.c | 18 +- harbour/source/rtl/memofile.c | 4 +- harbour/source/rtl/memvarbl.prg | 2 +- harbour/source/rtl/mlcfunc.c | 2 +- harbour/source/rtl/mtran.c | 1 - harbour/source/rtl/net.c | 28 +- harbour/source/rtl/oemansi.c | 4 +- harbour/source/rtl/philes53.c | 4 +- harbour/source/rtl/philesx.c | 2 +- harbour/source/rtl/profiler.prg | 4 +- harbour/source/rtl/pushbtn.prg | 10 +- harbour/source/rtl/radiogrp.prg | 12 +- harbour/source/rtl/scrollbr.prg | 8 +- harbour/source/rtl/scrrow.c | 2 +- harbour/source/rtl/setposbs.c | 2 +- harbour/source/rtl/stuff.c | 1 - harbour/source/rtl/tbrowsys.prg | 1 - harbour/source/rtl/tgetlist.prg | 2 +- harbour/source/rtl/tlabel.prg | 2 +- harbour/source/rtl/tmenuitm.prg | 2 +- harbour/source/rtl/tobject.prg | 2 +- harbour/source/rtl/transfrm.c | 4 +- harbour/source/rtl/typefile.prg | 2 +- harbour/source/rtl/wait.prg | 2 +- harbour/source/rtl/xsavescr.c | 2 +- harbour/source/vm/break.c | 1 - harbour/source/vm/classes.c | 2 +- harbour/source/vm/cmdarg.c | 2 +- harbour/source/vm/dynlibhb.c | 6 +- harbour/source/vm/extrap.c | 16 +- harbour/source/vm/fm.c | 30 +-- harbour/source/vm/hvm.c | 6 +- harbour/source/vm/itemapi.c | 16 +- harbour/source/vm/macro.c | 6 +- harbour/source/vm/main.c | 5 +- harbour/source/vm/maindll.c | 2 +- harbour/source/vm/maindllp.c | 6 +- harbour/source/vm/mainstd.c | 8 +- harbour/source/vm/mainwin.c | 4 +- harbour/source/vm/set.c | 16 +- harbour/source/vm/thread.c | 8 +- harbour/utils/hbtest/rt_main.ch | 1 - harbour/utils/hbtest/rt_main.h | 4 +- harbour/utils/hbtest/rt_misc.prg | 2 +- harbour/utils/hbtest/rt_trans.prg | 6 +- harbour/utils/hbtest/rt_vars.ch | 1 - 320 files changed, 1603 insertions(+), 1397 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cc0d3dd5e5..1cf73f1481 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,332 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-09 23:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbvmpub.h + * include/extend.api + * include/hbwince.h + * include/hb_io.h + * include/hbdefs.h + * include/hbsetup.h + * include/hbinit.h + * include/clipdefs.h + * include/hbmath.h + * include/hbzlib.h + * include/hbregex.h + * include/hbexprb.c + * source/pp/hbpp.c + * source/lang/msgrukoi.c + * source/lang/msgzhgb.c + * source/lang/msgruwin.c + * source/lang/msgelwin.c + * source/lang/msgro.c + * source/lang/msghriso.c + * source/lang/msgcskam.c + * source/lang/msggl.c + * source/lang/msges.c + * source/lang/msgde.c + * source/lang/msgru866.c + * source/lang/msgcs852.c + * source/lang/msgplmaz.c + * source/lang/msgpliso.c + * source/lang/msgplwin.c + * source/lang/msgid.c + * source/lang/msgel.c + * source/lang/msgdewin.c + * source/lang/msghr437.c + * source/lang/msghr852.c + * source/lang/msgcsiso.c + * source/lang/msgcswin.c + * source/lang/msgeswin.c + * source/vm/macro.c + * source/vm/mainwin.c + * source/vm/maindll.c + * source/vm/itemapi.c + * source/vm/hvm.c + * source/vm/cmdarg.c + * source/vm/mainstd.c + * source/vm/maindllp.c + * source/vm/fm.c + * source/vm/extrap.c + * source/vm/thread.c + * source/vm/main.c + * source/vm/break.c + * source/vm/dynlibhb.c + * source/vm/set.c + * source/vm/classes.c + * source/debug/dbgtwin.prg + * source/debug/dbgtmenu.prg + * source/debug/dbgmenu.prg + * source/debug/dbgthsh.prg + * source/debug/dbgwa.prg + * source/common/hbgete.c + * source/common/hbver.c + * source/common/hbprintf.c + * source/common/hbfsapi.c + * source/common/hbverdsp.c + * source/common/hbwince.c + * source/common/hbfopen.c + * source/common/hbdate.c + * source/macro/macroa.c + * source/macro/macrob.c + * source/rtl/lennum.c + * source/rtl/gtdos/gtdos.c + * source/rtl/setposbs.c + * source/rtl/gtwin/gtwin.c + * source/rtl/typefile.prg + * source/rtl/math.c + * source/rtl/getsys53.prg + * source/rtl/tobject.prg + * source/rtl/gtcrs/gtcrs.c + * source/rtl/gtcrs/gtcrs.h + * source/rtl/philesx.c + * source/rtl/filehb.c + * source/rtl/hbtoken.c + * source/rtl/fstemp.c + * source/rtl/ampm.c + * source/rtl/maxrow.c + * source/rtl/hbstrfmt.c + * source/rtl/transfrm.c + * source/rtl/gttone.c + * source/rtl/datec.c + * source/rtl/fserr.c + * source/rtl/pushbtn.prg + * source/rtl/memvarbl.prg + * source/rtl/hbregexc.c + * source/rtl/profiler.prg + * source/rtl/hbini.prg + * source/rtl/dbedit.prg + * source/rtl/filesys.c + * source/rtl/lang.c + * source/rtl/einstv52.prg + * source/rtl/hbbit.c + * source/rtl/isprint.c + * source/rtl/altd.prg + * source/rtl/diskspac.c + * source/rtl/console.c + * source/rtl/gtos2/gtos2.c + * source/rtl/adir.prg + * source/rtl/gui.prg + * source/rtl/hbgtcore.c + * source/rtl/dirdrive.c + * source/rtl/wait.prg + * source/rtl/mlcfunc.c + * source/rtl/scrollbr.prg + * source/rtl/gtapiu.c + * source/rtl/tbrowsys.prg + * source/rtl/oemansi.c + * source/rtl/philes53.c + * source/rtl/color53.prg + * source/rtl/xsavescr.c + * source/rtl/tgetlist.prg + * source/rtl/gtsln/mousesln.c + * source/rtl/gtsln/kbsln.c + * source/rtl/gtsln/gtsln.h + * source/rtl/disksphb.c + * source/rtl/tlabel.prg + * source/rtl/radiogrp.prg + * source/rtl/scrrow.c + * source/rtl/net.c + * source/rtl/stuff.c + * source/rtl/checkbox.prg + * source/rtl/filebuf.c + * source/rtl/mtran.c + * source/rtl/gete.c + * source/rtl/hbproces.c + * source/rtl/gtwvt/gtwvt.c + * source/rtl/fssize.c + * source/rtl/memofile.c + * source/rtl/hbffind.c + * source/rtl/tmenuitm.prg + * source/rtl/gtsys.c + * source/rtl/devoutp.prg + * source/codepage/uckoi8.c + * source/codepage/uckoi8u.c + * source/codepage/cphu852s.c + * source/codepage/cpes850c.c + * source/codepage/cphuisos.c + * source/codepage/ucmaz.c + * source/codepage/cptr857.c + * source/codepage/ucmik.c + * source/codepage/cphr437.c + * source/codepage/cphuwins.c + * source/rdd/dbjoin.prg + * source/rdd/dbnubs.c + * source/rdd/dbfuncs.prg + * source/rdd/dbtotal.prg + * source/rdd/dbstrux.prg + * source/rdd/dbsort.prg + * source/rdd/dbfcdx/dbfcdx1.c + * source/rdd/hbsix/sxcompr.c + * source/compiler/hbmain.c + * source/compiler/expropta.c + * source/compiler/exproptb.c + * source/compiler/fixflex.c + * source/compiler/compi18n.c + * source/compiler/gencobj.c + * source/compiler/hbopt.c + * source/compiler/hbgenerr.c + * utils/hbtest/rt_main.h + * utils/hbtest/rt_main.ch + * utils/hbtest/rt_trans.prg + * utils/hbtest/rt_misc.prg + * utils/hbtest/rt_vars.ch + * contrib/gtalleg/gtalleg.c + * contrib/gtalleg/ssf.h + * contrib/hbmysql/mysqlold.c + * contrib/hbmysql/mysql.c + * contrib/hbct/charlist.c + * contrib/hbct/ctnet.c + * contrib/hbct/charonly.c + * contrib/hbct/ctset.c + * contrib/hbct/ctset.h + * contrib/hbct/cterror.ch + * contrib/hbct/ftoc.c + * contrib/hbct/charevod.c + * contrib/hbct/exponent.c + * contrib/hbct/dattime3.c + * contrib/hbct/ct.prg + * contrib/hbct/cursor.c + * contrib/hbct/color.c + * contrib/hbct/charone.c + * contrib/hbct/numconv.prg + * contrib/hbct/cttime.prg + * contrib/hbct/ctstr.h + * contrib/hbct/atnum.c + * contrib/hbct/disk.c + * contrib/hbct/misc1.c + * contrib/hbct/print.c + * contrib/xhb/hblog.ch + * contrib/xhb/bkgtsks.c + * contrib/xhb/wintypes.ch + * contrib/xhb/classex.ch + * contrib/xhb/hbcomprs.c + * contrib/xhb/ttable.ch + * contrib/xhb/hbcompat.ch + * contrib/xhb/arrayblk.prg + * contrib/xhb/hbctypes.ch + * contrib/xhb/xhbextrn.ch + * contrib/xhb/filestat.c + * contrib/xhb/hblogdef.ch + * contrib/xhb/xhbcopyf.c + * contrib/xhb/hbserv.c + * contrib/xhb/xhbfunc.c + * contrib/hbodbc/odbcold.c + * contrib/hbtpathy/telepath.ch + * contrib/hbmzip/hbmzip.c + * contrib/hbblat/hbblat.ch + * contrib/hbxbp/xbpfiledialog.prg + * contrib/hbxbp/gra.ch + * contrib/hbxbp/xbpwindow.prg + * contrib/hbxbp/xbp.ch + * contrib/hbxbp/xbphtmlviewer.prg + * contrib/hbxbp/xbptoolbar.prg + * contrib/hbxbp/appevent.ch + * contrib/hbxbp/xbpgeneric.prg + * contrib/xpp/philesx.c + * contrib/hbnf/acctyear.prg + * contrib/hbnf/byteneg.prg + * contrib/hbnf/isshare.prg + * contrib/hbnf/kspeed.c + * contrib/hbnf/prtscr.c + * contrib/hbnf/ftshadow.c + * contrib/hbnf/descendn.c + * contrib/hbnf/scancode.prg + * contrib/hbnf/vidmode.prg + * contrib/hbnf/acctadj.prg + * contrib/hbnf/vidcur.prg + * contrib/hbnf/iamidle.c + * contrib/hbnf/acctmnth.prg + * contrib/hbnf/madd.prg + * contrib/hbnf/fttext.c + * contrib/hbnf/mouse1.prg + * contrib/hbnf/settime.prg + * contrib/hbnf/page.prg + * contrib/hbnf/setkeys.c + * contrib/hbnf/month.prg + * contrib/hbnf/acctweek.prg + * contrib/hbnf/acctqtr.prg + * contrib/hbnf/dosver.prg + * contrib/hbnf/metaph.prg + * contrib/hbnf/menu1.prg + * contrib/hbnf/byteand.prg + * contrib/hbnf/bytexor.prg + * contrib/hbnf/byteor.prg + * contrib/hbnf/asum.prg + * contrib/hbnf/wda.prg + * contrib/hbnf/aavg.prg + * contrib/hbnf/mouse.c + * contrib/hbnf/setdate.prg + * contrib/hbnf/amedian.prg + * contrib/hbnf/blink.prg + * contrib/hbnf/getvid.c + * contrib/hbnf/getver.c + * contrib/hbnf/nwuid.prg + * contrib/hbnf/aemaxlen.prg + * contrib/hbnf/bitset.prg + * contrib/hbnf/nwlstat.prg + * contrib/hbnf/tempfile.prg + * contrib/hbnf/diskfunc.prg + * contrib/hbnf/d2e.prg + * contrib/hbnf/mouse2.prg + * contrib/hbnf/firstday.prg + * contrib/hbnf/menutonf.prg + * contrib/hbnf/pvid.prg + * contrib/hbnf/isbit.prg + * contrib/hbnf/datecnfg.prg + * contrib/hbnf/putkey.c + * contrib/hbnf/getenvrn.c + * contrib/hbnf/bytenot.prg + * contrib/hbnf/aeminlen.prg + * contrib/hbnf/year.prg + * contrib/hbnf/ftmenuto.ch + * contrib/hbnf/rmdir.c + * contrib/hbnf/sysmem.prg + * contrib/hbnf/bitclr.prg + * contrib/hbnf/setlastk.c + * contrib/hbnf/clrsel.prg + * contrib/hbcurl/hbcurl.ch + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/wvgax.prg + * contrib/gtwvg/gtwvg.h + * contrib/gtwvg/wvggui.c + * contrib/gtwvg/wvggui.h + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgtabpg.prg + * contrib/gtwvg/wvgsink.c + * contrib/gtwvg/wvgwing.c + * contrib/hbclipsm/num.c + * contrib/hbclipsm/stack.c + * contrib/rddads/rddads.h + * contrib/rddads/ads1.c + * contrib/hbfimage/fi_winfu.c + * contrib/hbfimage/fi_wrp.c + * contrib/hbgd/gd.ch + * contrib/hbgd/gdchart.prg + * contrib/hbgd/gdimage.prg + * contrib/hbgd/gdwrp.c + * contrib/hbmisc/nconvert.prg + * contrib/hbmisc/stringsx.c + * contrib/hbmisc/spd.c + * contrib/hbmisc/stringp.prg + * contrib/hbwin/win_prn2.c + * contrib/hbwin/wapi_commctrl.c + * contrib/hbwin/wapi_winbase.c + * contrib/hbwin/wapi_winuser.c + * contrib/hbwin/hbwinole.h + * contrib/hbwin/win_dll.c + * contrib/hbwin/axfunc.prg + * contrib/hbwin/win_prn1.c + * contrib/hbvpdf/hbvpdf.ch + * examples/hboleold/win_ole.c + * Formatting: + - Removing EOL whitespaces. + - Removing extra empty lines at EOF. + - Adding EOL at EOF if missing. + (except in foreign code) + 2009-07-09 19:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbsqlit3/hbsqlit3.c * contrib/hbfimage/fi_wrp.c diff --git a/harbour/contrib/gtalleg/gtalleg.c b/harbour/contrib/gtalleg/gtalleg.c index 2ea02c283a..a944dc1467 100644 --- a/harbour/contrib/gtalleg/gtalleg.c +++ b/harbour/contrib/gtalleg/gtalleg.c @@ -74,7 +74,7 @@ static HB_GT_FUNCS SuperTable; static BOOL s_fInit; static BOOL s_fMakeInit; -static BOOL s_fGtError; +static BOOL s_fGtError; /* font definition */ static ssfFont s_ssfDefaultFont; @@ -353,7 +353,7 @@ static BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, BOOL if( iRows > 11 && iCols > 23 && iRows < 129 && iCols < 257 ) { -#if defined(AL_GFX_XWINDOWS) +#if defined( AL_GFX_XWINDOWS ) HB_TRACE(HB_TR_DEBUG, ("trying X DGA2 mode")); iRet = al_set_gfx_mode( AL_GFX_XDGA2, iWidth, iHeight, 0, 0 ); if( iRet != 0 ) @@ -367,14 +367,14 @@ static BOOL hb_gt_alleg_InitializeScreen( PHB_GT pGT, int iRows, int iCols, BOOL iRet = al_set_gfx_mode( AL_GFX_XWINDOWS, iWidth, iHeight, 0, 0 ); } #endif -#if defined (ALLEGRO_UNIX) || defined(ALLEGRO_LINUX) || defined(ALLEGRO_DOS) +#if defined( ALLEGRO_UNIX ) || defined( ALLEGRO_LINUX ) || defined( ALLEGRO_DOS ) if( iRet != 0 ) { HB_TRACE(HB_TR_DEBUG, ("trying VBE/AF mode")); iRet = al_set_gfx_mode( AL_GFX_VBEAF, iWidth, iHeight, 0, 0 ); } #endif -#if (defined(ALLEGRO_UNIX) || defined(ALLEGRO_LINUX)) && defined(AL_GFX_FBCON) +#if ( defined( ALLEGRO_UNIX ) || defined( ALLEGRO_LINUX ) ) && defined( AL_GFX_FBCON ) if( iRet != 0 ) { HB_TRACE(HB_TR_DEBUG, ("trying fb console mode")); diff --git a/harbour/contrib/gtalleg/ssf.h b/harbour/contrib/gtalleg/ssf.h index 88a67ce63f..535221ad49 100644 --- a/harbour/contrib/gtalleg/ssf.h +++ b/harbour/contrib/gtalleg/ssf.h @@ -62,26 +62,26 @@ #ifndef _SSF_H_ #define _SSF_H_ -#if defined(__BORLANDC__) +#if defined( __BORLANDC__ ) #define ALLEGRO_NO_ASM #define ALLEGRO_BCC32 -#elif defined(_MSC_VER) - #if defined(_WIN64) +#elif defined( _MSC_VER ) + #if defined( _WIN64 ) #define ALLEGRO_NO_ASM #endif #define ALLEGRO_MSVC -#elif defined(__MINGW32__) || defined(__CYGWIN__) +#elif defined( __MINGW32__ ) || defined( __CYGWIN__ ) #define ALLEGRO_MINGW32 - #if defined(__CYGWIN__) + #if defined( __CYGWIN__ ) #define SCAN_DEPEND #endif -#elif defined(__DMC__) +#elif defined( __DMC__ ) #define ALLEGRO_DMC -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) #define ALLEGRO_DJGPP -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) #define ALLEGRO_WATCOM -#elif defined(HB_OS_DARWIN) +#elif defined( HB_OS_DARWIN ) #define ALLEGRO_MACOSX #endif diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 2d37651493..c5f6201a83 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -833,7 +833,7 @@ static BOOL hb_gt_wvt_FitSize( PHB_GTWVT pWVT ) pWVT->PTEXTSIZE.x = tm.tmAveCharWidth; pWVT->PTEXTSIZE.y = tm.tmHeight; -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) pWVT->FixedFont = FALSE; #else pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 && @@ -925,7 +925,7 @@ static void hb_gt_wvt_Maximize( PHB_GTWVT pWVT ) /* Disable "maximize" button */ { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) DWORD style = GetWindowLong( pWVT->hWnd, GWL_STYLE ); SetWindowLong( pWVT->hWnd, GWL_STYLE, style &~ WS_MAXIMIZEBOX ); #else @@ -987,7 +987,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT ) tm.tmAveCharWidth; /* For fixed FONT should == tm.tmMaxCharWidth */ pWVT->PTEXTSIZE.y = tm.tmHeight; /* but seems to be a problem on Win9X so */ /* assume proportional fonts always for Win9X */ -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) pWVT->FixedFont = FALSE; #else pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 && @@ -1293,7 +1293,7 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L rect.right != pWVT->sRectOld.right || rect.bottom != pWVT->sRectOld.bottom ) { -#if !defined(HB_OS_WIN_CE) /* WinCE does not support InvertRgn */ +#if !defined( HB_OS_WIN_CE ) /* WinCE does not support InvertRgn */ /* Concept forwarded by Andy Wos - thanks. */ HRGN rgn1 = CreateRectRgn( pWVT->sRectOld.left, pWVT->sRectOld.top, pWVT->sRectOld.right, pWVT->sRectOld.bottom ); HRGN rgn2 = CreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); @@ -2084,7 +2084,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara /* Enable "maximize" button */ { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, GetWindowLong( pWVT->hWnd, GWL_STYLE ) | WS_MAXIMIZEBOX ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, GetWindowLong( pWVT->hWnd, GWL_STYLE ) | WS_MAXIMIZEBOX ); @@ -2100,7 +2100,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara hb_gt_wvt_FitSizeRows( pWVT ); return 0; -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) case WM_NCLBUTTONDBLCLK: if( !pWVT->bMaximized ) { @@ -2555,7 +2555,7 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT ) if( pSetLayeredWindowAttributes ) { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_EXSTYLE, GetWindowLong( pWVT->hWnd, GWL_EXSTYLE ) | WS_EX_LAYERED ); #else SetWindowLongPtr( pWVT->hWnd, GWL_EXSTYLE, GetWindowLongPtr( pWVT->hWnd, GWL_EXSTYLE ) | WS_EX_LAYERED ); @@ -3276,7 +3276,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->bResizable = bNewValue; if( pWVT->hWnd ) { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) LONG style = GetWindowLong( pWVT->hWnd, GWL_STYLE ); #else LONG_PTR style = GetWindowLongPtr( pWVT->hWnd, GWL_STYLE ); @@ -3285,7 +3285,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) style = style | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME; else style = ( style & ~( WS_MAXIMIZEBOX | WS_THICKFRAME ) ) | WS_BORDER; -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, style ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style ); @@ -3314,7 +3314,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) ); pWVT->bSelectCopy = TRUE; -#if !defined(HB_OS_WIN_CE) /* WinCE does not support ModifyMenu */ +#if !defined( HB_OS_WIN_CE ) /* WinCE does not support ModifyMenu */ if( hSysMenu ) { LPTSTR buffer; diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index 1c61f13c44..295a7905d1 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -154,15 +154,15 @@ HB_EXTERN_BEGIN #define WVT_DLGMD_MAX 50 /*----------------------------------------------------------------------*/ -#if defined(__DMC__) +#if defined( __DMC__ ) #if (_WIN32_IE >= 0x0300) - #if !defined(ICC_BAR_CLASSES) + #if !defined( ICC_BAR_CLASSES ) #define ICC_BAR_CLASSES 0x00000004 #endif - #if !defined(COLOR16) + #if !defined( COLOR16 ) typedef USHORT COLOR16; #endif - #if !defined(TRIVERTEX) + #if !defined( TRIVERTEX ) typedef struct _TRIVERTEX { LONG x; LONG y; @@ -178,7 +178,7 @@ HB_EXTERN_BEGIN DWORD dwICC; /* flags indicating which classes to be initialized */ } INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX; #endif - #if !defined(InitCommonControlsEx) + #if !defined( InitCommonControlsEx ) WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX); #endif #endif @@ -212,13 +212,13 @@ HB_EXTERN_BEGIN #endif -#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined(__WATCOMC__) && ( __WATCOMC__ >= 1280 ) ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1280 ) ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id ) #endif -#if defined(__BORLANDC__) +#if defined( __BORLANDC__ ) #if __BORLANDC__ == 0x0550 #ifdef __cplusplus extern "C" { STDAPI OleLoadPicture(LPSTREAM,LONG,BOOL,REFIID,PVOID*); } diff --git a/harbour/contrib/gtwvg/wvgax.prg b/harbour/contrib/gtwvg/wvgax.prg index f0172775c4..bfb5bba303 100644 --- a/harbour/contrib/gtwvg/wvgax.prg +++ b/harbour/contrib/gtwvg/wvgax.prg @@ -404,4 +404,3 @@ METHOD onError( oError ) CLASS AutomationObject RETURN xValue #endif /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index fecb6e3afc..c121745530 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -1066,7 +1066,7 @@ HB_FUNC( WVT_DRAWBOXGET ) yz = hb_wvt_gtGetXYFromColRow( ( USHORT ) ( hb_parni( 2 ) + hb_parni( 3 ) ), ( USHORT ) hb_parni( 1 ) + 1 ); hb_wvt_DrawBoxGet( _s->hdc, xy.y, xy.x, yz.y, yz.x ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxGet( _s->hGuiDC, xy.y, xy.x, yz.y, yz.x ); @@ -1088,7 +1088,7 @@ HB_FUNC( WVT_DRAWBOXRAISED ) int iRight = ( _s->PTEXTSIZE.x * ( hb_parni( 4 ) + 1 ) ) - 1 + hb_parvni( 5,4 ); hb_wvt_DrawBoxRaised( _s->hdc, iTop-1, iLeft-1, iBottom+1, iRight+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRaised( _s->hGuiDC, iTop-1, iLeft-1, iBottom+1, iRight+1 ); @@ -1110,7 +1110,7 @@ HB_FUNC( WVT_DRAWBOXRECESSED ) int iRight = ( _s->PTEXTSIZE.x * ( hb_parni( 4 ) + 1 ) ) - 1 + hb_parvni( 5,4 ); hb_wvt_DrawBoxRecessed( _s->hdc, iTop-1, iLeft-1, iBottom+1, iRight+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRecessed( _s->hGuiDC, iTop-1, iLeft-1, iBottom+1, iRight+1 ); @@ -1132,7 +1132,7 @@ HB_FUNC( WVT_DRAWBOXGROUP ) int iRight = ( _s->PTEXTSIZE.x * ( hb_parni( 4 ) + 1 ) ) - 1 + hb_parvni( 5,4 ); hb_wvt_DrawBoxGroup( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxGroup( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -1154,7 +1154,7 @@ HB_FUNC( WVT_DRAWBOXGROUPRAISED ) int iRight = ( _s->PTEXTSIZE.x * ( hb_parni( 4 ) + 1 ) ) - 1 + hb_parvni( 5,4 ); hb_wvt_DrawBoxGroupRaised( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxGroupRaised( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -1189,7 +1189,7 @@ HB_FUNC( WVT_DRAWIMAGE ) else { hb_wvt_DrawImage( _s->hdc, iLeft, iTop, ( iRight - iLeft ) + 1, ( iBottom - iTop ) + 1, hb_parcx( 5 ) ) ; - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawImage( _s->hGuiDC, iLeft, iTop, ( iRight - iLeft ) + 1, ( iBottom - iTop ) + 1, hb_parcx( 5 ) ) ; @@ -1253,7 +1253,7 @@ HB_FUNC( WVT_DRAWLABEL ) ExtTextOut( _s->hdc, xy.x, xy.y, 0, NULL, text, lstrlen( text ), NULL ); SelectObject( _s->hdc, hOldFont ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetBkColor( _s->hGuiDC, bgClr ); @@ -1309,7 +1309,7 @@ HB_FUNC( WVT_DRAWOUTLINE ) } hb_wvt_DrawOutline( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { if ( hPen ) @@ -1424,7 +1424,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y+1, NULL ); LineTo( _s->hdc, iRight, y+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->penWhite ); @@ -1444,7 +1444,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x+1, y, NULL ); LineTo( _s->hdc, x+1, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->penWhite ); @@ -1469,7 +1469,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, _s->pGUI->penWhite ); MoveToEx( _s->hdc, x, y+1, NULL ); LineTo( _s->hdc, iRight, y+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -1489,7 +1489,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, _s->pGUI->penWhite ); MoveToEx( _s->hdc, x+1, y, NULL ); LineTo( _s->hdc, x+1, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -1511,7 +1511,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y, NULL ); LineTo( _s->hdc, iRight, y ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -1525,7 +1525,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y, NULL ); LineTo( _s->hdc, x, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -1565,7 +1565,7 @@ HB_FUNC( WVT_DRAWELLIPSE ) SelectObject( _s->hdc, _s->currentPen ); hb_retl( Ellipse( _s->hdc, iLeft, iTop, iRight, iBottom ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_retl( Ellipse( _s->hGuiDC, iLeft, iTop, iRight, iBottom ) ); @@ -1590,7 +1590,7 @@ HB_FUNC( WVT_DRAWRECTANGLE ) SelectObject( _s->hdc, _s->currentPen ); hb_retl( Rectangle( _s->hdc, iLeft, iTop, iRight, iBottom ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_retl( Rectangle( _s->hGuiDC, iLeft, iTop, iRight, iBottom ) ); @@ -1619,7 +1619,7 @@ HB_FUNC( WVT_DRAWROUNDRECT ) SelectObject( _s->hdc, _s->currentPen ); hb_retl( RoundRect( _s->hdc, iLeft, iTop, iRight, iBottom, iWd, iHt ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_retl( RoundRect( _s->hGuiDC, iLeft, iTop, iRight, iBottom, iWd, iHt ) ); @@ -1647,7 +1647,7 @@ HB_FUNC( WVT_DRAWFOCUSRECT ) rc.bottom = iBottom; hb_retl( DrawFocusRect( _s->hdc, &rc ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_retl( DrawFocusRect( _s->hGuiDC, &rc ) ); @@ -1680,7 +1680,7 @@ HB_FUNC( WVT_DRAWCOLORRECT ) rc.bottom = iBottom; hb_retl( FillRect( _s->hdc, &rc, hBrush ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_retl( FillRect( _s->hGuiDC, &rc, hBrush ) ); @@ -1720,7 +1720,7 @@ HB_FUNC( WVT_DRAWGRIDHORZ ) iAtRow++; } - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { iAtRow = hb_parni( 1 ); @@ -1775,7 +1775,7 @@ HB_FUNC( WVT_DRAWGRIDVERT ) MoveToEx( _s->hdc, x, iTop, NULL ); LineTo( _s->hdc, x, iBottom ); } - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->currentPen ); @@ -1837,7 +1837,7 @@ HB_FUNC( WVT_DRAWBUTTON ) rc.bottom = iBottom + 1; FillRect( _s->hdc, &rc, hBrush ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { FillRect( _s->hGuiDC, &rc, hBrush ); @@ -2085,7 +2085,7 @@ HB_FUNC( WVT_DRAWLABELEX ) SelectObject( _s->hdc, _s->pGUI->hUserFonts[ iSlot ] ); ExtTextOut( _s->hdc, xy.x, xy.y, 0, NULL, text, lstrlen( text ), NULL ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetBkColor( _s->hGuiDC, bgClr ); @@ -2198,7 +2198,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y+1, NULL ); LineTo( _s->hdc, iRight, y+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->penWhite ); @@ -2218,7 +2218,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x+1, y, NULL ); LineTo( _s->hdc, x+1, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->penWhite ); @@ -2243,7 +2243,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, _s->pGUI->penWhite ); MoveToEx( _s->hdc, x, y+1, NULL ); LineTo( _s->hdc, iRight, y+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -2263,7 +2263,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, _s->pGUI->penWhite ); MoveToEx( _s->hdc, x+1, y, NULL ); LineTo( _s->hdc, x+1, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -2285,7 +2285,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y, NULL ); LineTo( _s->hdc, iRight, y ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -2299,7 +2299,7 @@ HB_FUNC( WVT_DRAWLINEEX ) SelectObject( _s->hdc, hPen ); MoveToEx( _s->hdc, x, y, NULL ); LineTo( _s->hdc, x, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, hPen ); @@ -2344,7 +2344,7 @@ HB_FUNC( WVT_DRAWOUTLINEEX ) } hb_wvt_DrawOutline( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawOutline( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -2432,7 +2432,7 @@ HB_FUNC( WVT_DRAWLABELOBJ ) uiOptions = ETO_CLIPPED | ETO_OPAQUE ; ExtTextOut( _s->hdc, x, y, uiOptions, &rect, text, lstrlen( text ), NULL ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetTextColor( _s->hGuiDC, fgClr ); @@ -2466,7 +2466,7 @@ HB_FUNC( WVT_DRAWTOOLBUTTONSTATE ) case 0: /* Flat */ { hb_wvt_DrawToolButtonFlat( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawToolButtonFlat( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -2478,7 +2478,7 @@ HB_FUNC( WVT_DRAWTOOLBUTTONSTATE ) case 1: /* Raised */ { hb_wvt_DrawToolButtonUp( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawToolButtonUp( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -2490,7 +2490,7 @@ HB_FUNC( WVT_DRAWTOOLBUTTONSTATE ) case 2: /* Recessed */ { hb_wvt_DrawToolButtonDown( _s->hdc, iTop, iLeft, iBottom, iRight ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawToolButtonDown( _s->hGuiDC, iTop, iLeft, iBottom, iRight ); @@ -2528,7 +2528,7 @@ HB_FUNC( WVT_DRAWSCROLLBUTTON ) if ( bDepressed ) { hb_wvt_DrawBoxRecessed( _s->hdc, iTop+1, iLeft+1, iBottom-2, iRight-2 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRecessed( _s->hGuiDC, iTop+1, iLeft+1, iBottom-2, iRight-2 ); @@ -2538,7 +2538,7 @@ HB_FUNC( WVT_DRAWSCROLLBUTTON ) else { hb_wvt_DrawBoxRaised( _s->hdc, iTop+1, iLeft+1, iBottom-2, iRight-2 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRaised( _s->hGuiDC, iTop+1, iLeft+1, iBottom-2, iRight-2 ); @@ -2603,7 +2603,7 @@ HB_FUNC( WVT_DRAWSCROLLBUTTON ) SelectObject( _s->hdc, _s->pGUI->solidBrush ); Polygon( _s->hdc, Point, 3 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->solidBrush ); @@ -2633,7 +2633,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBVERT ) SelectObject( _s->hdc, _s->pGUI->diagonalBrush ); SelectObject( _s->hdc, _s->pGUI->penNull ); Rectangle( _s->hdc, iLeft, iTop, iRight+1, iBottom+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetBkMode( _s->hGuiDC, OPAQUE ); @@ -2652,7 +2652,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBVERT ) SelectObject( _s->hdc, _s->pGUI->whiteBrush ); SelectObject( _s->hdc, _s->pGUI->penGray ); Rectangle( _s->hdc, iTabLft, iTabTop, iTabRgt+1, iTabBtm ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->whiteBrush ); @@ -2661,7 +2661,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBVERT ) } #endif hb_wvt_DrawBoxRaised( _s->hdc, iTabTop+1, iTabLft+1, iTabBtm-2, iTabRgt-2 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRaised( _s->hGuiDC, iTabTop+1, iTabLft+1, iTabBtm-2, iTabRgt-2 ); @@ -2692,7 +2692,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBHORZ ) SelectObject( _s->hdc, _s->pGUI->diagonalBrush ); SelectObject( _s->hdc, _s->pGUI->penNull ); Rectangle( _s->hdc, iLeft, iTop, iRight+1, iBottom+1 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetBkMode( _s->hGuiDC, OPAQUE ); @@ -2706,7 +2706,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBHORZ ) SelectObject( _s->hdc, _s->pGUI->whiteBrush ); SelectObject( _s->hdc, _s->pGUI->penGray ); Rectangle( _s->hdc, iThumbLeft, iTop, iThumbRight, iBottom ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SelectObject( _s->hGuiDC, _s->pGUI->whiteBrush ); @@ -2715,7 +2715,7 @@ HB_FUNC( WVT_DRAWSCROLLTHUMBHORZ ) } #endif hb_wvt_DrawBoxRaised( _s->hdc, iTop+1, iThumbLeft+1, iBottom-2, iThumbRight-2 ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawBoxRaised( _s->hGuiDC, iTop+1, iThumbLeft+1, iBottom-2, iThumbRight-2 ); @@ -2764,7 +2764,7 @@ HB_FUNC( WVT_DRAWSHADEDRECT ) gRect.LowerRight= 1; bGF = ( BOOL ) _s->pGUI->pfnGF( _s->hdc, vert, 2, &gRect, 1, iMode ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { bGF = ( BOOL ) _s->pGUI->pfnGF( _s->hGuiDC, vert, 2, &gRect, 1, iMode ); @@ -2825,7 +2825,7 @@ HB_FUNC( WVT_DRAWTEXTBOX ) SelectObject( _s->hdc, ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 12 ) ); DrawText( _s->hdc, text, lstrlen( text ), &rc, iAlignH | DT_WORDBREAK | DT_TOP ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { SetTextAlign( _s->hGuiDC, TA_TOP | TA_LEFT | TA_NOUPDATECP ); @@ -2907,7 +2907,7 @@ HB_FUNC( WVT_DRAWPROGRESSBAR ) if ( bImage ) { hb_wvt_DrawImage( _s->hdc, rc.left, rc.top, rc.right-rc.left+1, rc.bottom-rc.top+1, hb_parc( 9 ) ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { hb_wvt_DrawImage( _s->hGuiDC, rc.left, rc.top, rc.right-rc.left+1, rc.bottom-rc.top+1, hb_parc( 9 ) ); @@ -2930,7 +2930,7 @@ HB_FUNC( WVT_DRAWPROGRESSBAR ) rc.right++; FillRect( _s->hdc, &rc, hBrush ); - #if defined(__SETGUI__) + #if defined( __SETGUI__ ) if ( _s->bGui ) { FillRect( _s->hGuiDC, &rc, hBrush ); diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index c8b9e8fb0f..9317f7be6e 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -1805,7 +1805,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->bResizable = bNewValue; if( pWVT->hWnd ) { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) LONG style; #else LONG_PTR style; @@ -1815,7 +1815,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) else style = WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_BORDER; -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, style ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, style ); diff --git a/harbour/contrib/gtwvg/wvggui.h b/harbour/contrib/gtwvg/wvggui.h index 4c3b3c8bdd..ac7e50a4d6 100644 --- a/harbour/contrib/gtwvg/wvggui.h +++ b/harbour/contrib/gtwvg/wvggui.h @@ -150,15 +150,15 @@ HB_EXTERN_BEGIN #define WVT_DLGMD_MAX 50 /*----------------------------------------------------------------------*/ -#if defined(__DMC__) +#if defined( __DMC__ ) #if (_WIN32_IE >= 0x0300) - #if !defined(ICC_BAR_CLASSES) + #if !defined( ICC_BAR_CLASSES ) #define ICC_BAR_CLASSES 0x00000004 #endif - #if !defined(COLOR16) + #if !defined( COLOR16 ) typedef USHORT COLOR16; #endif - #if !defined(TRIVERTEX) + #if !defined( TRIVERTEX ) typedef struct _TRIVERTEX { LONG x; LONG y; @@ -174,7 +174,7 @@ HB_EXTERN_BEGIN DWORD dwICC; /* flags indicating which classes to be initialized */ } INITCOMMONCONTROLSEX, *LPINITCOMMONCONTROLSEX; #endif - #if !defined(InitCommonControlsEx) + #if !defined( InitCommonControlsEx ) WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX); #endif #endif @@ -208,13 +208,13 @@ HB_EXTERN_BEGIN #endif -#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined(__WATCOMC__) && ( __WATCOMC__ >= 1280 ) ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1280 ) ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id ) #endif -#if defined(__BORLANDC__) +#if defined( __BORLANDC__ ) #if __BORLANDC__ == 0x0550 #ifdef __cplusplus extern "C" { STDAPI OleLoadPicture(LPSTREAM,LONG,BOOL,REFIID,PVOID*); } @@ -291,7 +291,7 @@ typedef struct PHB_CODEPAGE hostCDP; /* Host/HVM CodePage for unicode output translations */ PHB_CODEPAGE inCDP; /* Host/HVM CodePage for unicode input translations */ -#if !defined(UNICODE) +#if !defined( UNICODE ) BYTE keyTransTbl[ 256 ]; BYTE chrTransTbl[ 256 ]; #endif diff --git a/harbour/contrib/gtwvg/wvgsink.c b/harbour/contrib/gtwvg/wvgsink.c index d732b5252b..9a27843c46 100644 --- a/harbour/contrib/gtwvg/wvgsink.c +++ b/harbour/contrib/gtwvg/wvgsink.c @@ -63,7 +63,7 @@ /*----------------------------------------------------------------------*/ -#if defined(__BORLANDC__) && !defined(HB_ARCH_64BIT) +#if defined( __BORLANDC__ ) && !defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | \ (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) diff --git a/harbour/contrib/gtwvg/wvgtabpg.prg b/harbour/contrib/gtwvg/wvgtabpg.prg index 4aac618c63..bb95ef9c26 100644 --- a/harbour/contrib/gtwvg/wvgtabpg.prg +++ b/harbour/contrib/gtwvg/wvgtabpg.prg @@ -545,4 +545,4 @@ TCS_RAGGEDRIGHT TCS_RIGHT TCS_VERTICAL -#endif \ No newline at end of file +#endif diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index 0531e8ba75..d269b3d03b 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -73,11 +73,11 @@ #include "gtwvg.h" /* workaround for missing declaration in MinGW32 */ -#if !defined(TTM_SETTITLE) && defined(TTM_SETTITLEA) +#if !defined( TTM_SETTITLE ) && defined( TTM_SETTITLEA ) #define TTM_SETTITLE TTM_SETTITLEA #endif -#if defined(__MINGW32CE__) +#if defined( __MINGW32CE__ ) /* ChooseColorW() problem is fixed in current devel MINGW32CE version but * people who use recent official release (0.50) needs it */ @@ -604,8 +604,8 @@ HB_FUNC( WVT_SETPOINTER ) break; } -#if !defined(HB_ARCH_64BIT) && ( defined( __WATCOMC__ ) || defined(__DMC__) || \ - ( defined(_MSC_VER) && ( _MSC_VER <= 1200 || defined(HB_OS_WIN_CE) ) ) ) +#if !defined( HB_ARCH_64BIT ) && ( defined( __WATCOMC__ ) || defined( __DMC__ ) || \ + ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) ) ) SetClassLong( _s->hWnd, GCLP_HCURSOR, ( DWORD ) hCursor ); #else SetClassLongPtr( _s->hWnd, GCLP_HCURSOR, ( LONG_PTR ) hCursor ); diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index 6a13711c5f..c1be69b438 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -109,7 +109,7 @@ /*----------------------------------------------------------------------*/ -#if defined(__BORLANDC__) && !defined(HB_ARCH_64BIT) +#if defined( __BORLANDC__ ) && !defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | \ (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) @@ -916,7 +916,7 @@ HB_FUNC( WVG_SETWNDPROC ) WNDPROC wndProc = ( WNDPROC ) ( HB_PTRDIFF ) hb_parnint( 2 ); WNDPROC oldProc; -#if ( defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) oldProc = ( WNDPROC ) SetWindowLong( hWnd, GWL_WNDPROC, ( long ) wndProc ); #else oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRDIFF ) wndProc ); diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 2039fe7371..5786a78974 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -109,7 +109,7 @@ /*----------------------------------------------------------------------*/ -#if defined(__BORLANDC__) && !defined(HB_ARCH_64BIT) +#if defined( __BORLANDC__ ) && !defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | \ (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) @@ -1013,7 +1013,7 @@ HB_FUNC( WVG_HEIGHTTOPOINTSIZE ) HB_FUNC( WVG_SETCURRENTBRUSH ) { #if ! defined( HB_OS_WIN_CE ) -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetClassLong( wvg_parhwnd( 1 ), GCL_HBRBACKGROUND, ( DWORD ) hb_parnint( 2 ) ); #else SetClassLongPtr( wvg_parhwnd( 1 ), GCLP_HBRBACKGROUND, ( LONG_PTR ) hb_parnint( 2 ) ); @@ -1195,7 +1195,7 @@ HB_FUNC( WVG_SETWINDOWPROCBLOCK ) SetProp( hWnd, TEXT( "BLOCKCALLBACK" ), pBlock ); -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) oldProc = ( WNDPROC ) SetWindowLong( hWnd, GWL_WNDPROC, ( long ) ControlWindowProcedure ); #else oldProc = ( WNDPROC ) SetWindowLongPtr( hWnd, GWLP_WNDPROC, ( HB_PTRDIFF ) ControlWindowProcedure ); diff --git a/harbour/contrib/hbblat/hbblat.ch b/harbour/contrib/hbblat/hbblat.ch index a1f961d24f..6fde6eae86 100644 --- a/harbour/contrib/hbblat/hbblat.ch +++ b/harbour/contrib/hbblat/hbblat.ch @@ -197,4 +197,4 @@ Gensock Error Code Descriptions #define BLAT_TRY_INFINITE_VALUE 'INFINITE' -#endif // _HBBLAT_CH \ No newline at end of file +#endif // _HBBLAT_CH diff --git a/harbour/contrib/hbclipsm/num.c b/harbour/contrib/hbclipsm/num.c index dd06545d89..c4612ef94c 100644 --- a/harbour/contrib/hbclipsm/num.c +++ b/harbour/contrib/hbclipsm/num.c @@ -66,7 +66,7 @@ HB_FUNC( DTOR ) hb_retndlen( ( hb_parnd( 1 ) / 180 ) * PI, 10, 9 ); } -/* NumAsLog10( ) --> nLog10 +/* NumAsLog10( ) --> nLog10 Convert a positive number to log base 10 */ HB_FUNC( NUMASLOG10 ) diff --git a/harbour/contrib/hbclipsm/stack.c b/harbour/contrib/hbclipsm/stack.c index a4028b8146..861c65ff18 100644 --- a/harbour/contrib/hbclipsm/stack.c +++ b/harbour/contrib/hbclipsm/stack.c @@ -64,7 +64,7 @@ HB_FUNC( STACKNEW ) */ HB_FUNC( STACKPUSH ) { - hb_arrayAdd( hb_param( 1, HB_IT_ARRAY ), + hb_arrayAdd( hb_param( 1, HB_IT_ARRAY ), hb_param( 2, HB_IT_ANY ) ); } diff --git a/harbour/contrib/hbct/atnum.c b/harbour/contrib/hbct/atnum.c index 41e1c39b85..2fa81ea03a 100644 --- a/harbour/contrib/hbct/atnum.c +++ b/harbour/contrib/hbct/atnum.c @@ -251,7 +251,7 @@ static void do_atnum( int iSwitch ) case DO_ATNUM_ATNUM: /* ATNUM */ -#if defined(__POCC__) && (__POCC__ >= 500) && defined(HB_OS_WIN_64) +#if defined( __POCC__ ) && ( __POCC__ >= 500 ) && defined( HB_OS_WIN_64 ) /* NOTE: Workaround for Pelles C 5.00.13 AMD64 mode internal error: 'fatal error: Internal error: reduce_tree()' [vszakats]. */ hb_retnl( pc - pcString + sIgnore + 1 ); diff --git a/harbour/contrib/hbct/charevod.c b/harbour/contrib/hbct/charevod.c index 5b3a6b25d1..0bc5294da7 100644 --- a/harbour/contrib/hbct/charevod.c +++ b/harbour/contrib/hbct/charevod.c @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * CT3 string functions * - CHAREVEN() * - CHARODD() diff --git a/harbour/contrib/hbct/charlist.c b/harbour/contrib/hbct/charlist.c index ff34764bbc..5df422be26 100644 --- a/harbour/contrib/hbct/charlist.c +++ b/harbour/contrib/hbct/charlist.c @@ -3,11 +3,11 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * CT3 string functions * - CHARLIST() * - CHARSLIST() (NEW) - * - CHARNOLIST() + * - CHARNOLIST() * - CHARHIST() (NEW) * * Copyright 2001 IntTec GmbH, Neunlindenstr 32, 79106 Freiburg, Germany @@ -317,7 +317,7 @@ HB_FUNC( CHARNOLIST ) * Default: "" (empty string) * $RETURNS$ * an array with 256 elements where the nth element - * contains the count of character #(n-1) in cString + * contains the count of character #(n-1) in cString * $DESCRIPTION$ * The CHARHIST() function generates a character histogram of those * characters that are contained in . This histogram is stored diff --git a/harbour/contrib/hbct/charone.c b/harbour/contrib/hbct/charone.c index 3d1fc9ee1a..1ebdda7cb4 100644 --- a/harbour/contrib/hbct/charone.c +++ b/harbour/contrib/hbct/charone.c @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * CT3 string functions * - CHARONE() * - WORDONE() @@ -225,7 +225,7 @@ static void do_charone( int iSwitch ) * The CHARONE() function reduces multiple occurences of characters in * to a single one. It is important to note that the multiple * occurences must occur directly one behind the other. This behaviour is - * is in contrast to the CHARLIST() function. + * is in contrast to the CHARLIST() function. * $EXAMPLES$ * ? CHARONE("122333a123") // "123a123" * ? CHARONE("A B CCCD") // "A B CD" diff --git a/harbour/contrib/hbct/charonly.c b/harbour/contrib/hbct/charonly.c index fc3a070bcb..aec5963aa5 100644 --- a/harbour/contrib/hbct/charonly.c +++ b/harbour/contrib/hbct/charonly.c @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * CT3 string functions * - CHARONLY() * - CHARREM() diff --git a/harbour/contrib/hbct/color.c b/harbour/contrib/hbct/color.c index 5171da9624..fd5e30f296 100644 --- a/harbour/contrib/hbct/color.c +++ b/harbour/contrib/hbct/color.c @@ -61,9 +61,9 @@ * $CATEGORY$ * CT3 video functions * $ONELINER$ - * + * * $SYNTAX$ - * + * * $ARGUMENTS$ * $RETURNS$ * $DESCRIPTION$ @@ -119,10 +119,10 @@ HB_FUNC( INVERTATTR ) * * $DESCRIPTION$ * COLOR TO (N)umeric - * The function changes an alphanumeric color attribute from NN/NN or - * CC/CC into a combined numeric attribute. These combined attribute - * values are useful with the CA-Cl*pper Tools functions STRSCREEN(), - * SCREENMIX(), SCREENATTR(), and the CA-Cl*pper commands + * The function changes an alphanumeric color attribute from NN/NN or + * CC/CC into a combined numeric attribute. These combined attribute + * values are useful with the CA-Cl*pper Tools functions STRSCREEN(), + * SCREENMIX(), SCREENATTR(), and the CA-Cl*pper commands * SAVE/RESTORE SCREEN. * * TODO: add documentation @@ -165,16 +165,16 @@ HB_FUNC( COLORTON ) * * If designated as .F. or if the parameter is omitted, * NTOCOLOR() returns a string with a numeric color code. - * When designated as .T., NTOCOLOR() returns a string with + * When designated as .T., NTOCOLOR() returns a string with * the CA-Cl*pper alpha color coding. * * $RETURNS$ - * NTOCOLOR() returns the designated color attribute in the NN/NN + * NTOCOLOR() returns the designated color attribute in the NN/NN * or CC/CC form. * * $DESCRIPTION$ - * NTOCOLOR() converts a color attribute returned from another function - * in numeric form, into the alphanumeric data format. Use this + * NTOCOLOR() converts a color attribute returned from another function + * in numeric form, into the alphanumeric data format. Use this * attribute in conjunction with the CA-Cl*pper SET COLOR TO command. * * TODO: add documentation diff --git a/harbour/contrib/hbct/ct.prg b/harbour/contrib/hbct/ct.prg index 78ab3dc8d9..90cb8e00da 100644 --- a/harbour/contrib/hbct/ct.prg +++ b/harbour/contrib/hbct/ct.prg @@ -70,10 +70,10 @@ static sbInitialized := .F. * $RETURNS$ * lInitialized .T. if the function has been correctly initialized * $DESCRIPTION$ - * The CTINIT() function initializes the CT3 library. + * The CTINIT() function initializes the CT3 library. * Identical code is declared as INIT FUNCTION, thus should be executed - * automatically at the beginning of the application, but it is a good - * idea to call it once again explicitly somewhere at the beginning of + * automatically at the beginning of the application, but it is a good + * idea to call it once again explicitly somewhere at the beginning of * your program to check the initialization. * $EXAMPLES$ * $TESTS$ @@ -120,10 +120,10 @@ return sbInitialized * $RETURNS$ * nil * $DESCRIPTION$ - * The CTEXIT() function uninitializes the CT3 library. - * Identical code is declared as EXIT FUNCTION, thus should be executed - * automatically at the end of the application, but it is a good idea - * to call it explicitly somewhere at the end of your program to make + * The CTEXIT() function uninitializes the CT3 library. + * Identical code is declared as EXIT FUNCTION, thus should be executed + * automatically at the end of the application, but it is a good idea + * to call it explicitly somewhere at the end of your program to make * sure that the deinitialization takes place. * $EXAMPLES$ * $TESTS$ diff --git a/harbour/contrib/hbct/cterror.ch b/harbour/contrib/hbct/cterror.ch index 7a9a525239..f3eb1c2d9c 100644 --- a/harbour/contrib/hbct/cterror.ch +++ b/harbour/contrib/hbct/cterror.ch @@ -111,9 +111,9 @@ #define CT_ERROR_GETREAD_RANGEL 8900 /* get & read functions */ #define CT_ERROR_GETREAD_RANGEH 9099 -/* - * function error sub codes - * +/* + * function error sub codes + * * The sub code simply defines the function that throws the error. * The last digit stands for the type of the return value of the function: * @@ -160,7 +160,7 @@ #define CT_ERROR_WSETMOVE 1404 #define CT_ERROR_WSETSHADOW 1412 #define CT_ERROR_WSTEP 1422 - + /* extended driver */ #define CT_ERROR_CGA40 1614 #define CT_ERROR_CGA80 1624 @@ -228,7 +228,7 @@ #define CT_ERROR_COM_FLUSH 2524 #define CT_ERROR_COM_GETIO 2532 #define CT_ERROR_COM_GETIRQ 2542 -#define CT_ERROR_COM_HARD 2554 +#define CT_ERROR_COM_HARD 2554 #define CT_ERROR_COM_INIT 2564 #define CT_ERROR_COM_KEY 2574 #define CT_ERROR_COM_LSR 2582 @@ -247,13 +247,13 @@ #define CT_ERROR_COM_SFLUSH 2714 #define CT_ERROR_COM_SKEY 2724 #define CT_ERROR_COM_SMODE 2732 -#define CT_ERROR_COM_SOFT 2744 +#define CT_ERROR_COM_SOFT 2744 #define CT_ERROR_COM_SOFT_R 2754 #define CT_ERROR_COM_SOFT_S 2764 -#define CT_ERROR_XMOBLOCK 2771 -#define CT_ERROR_XMOCHECK 2782 -#define CT_ERROR_ZEROINSERT 2791 -#define CT_ERROR_ZEROREMOVE 2801 +#define CT_ERROR_XMOBLOCK 2771 +#define CT_ERROR_XMOCHECK 2782 +#define CT_ERROR_ZEROINSERT 2791 +#define CT_ERROR_ZEROREMOVE 2801 /* string functions */ #define CT_ERROR_ADDASCII 3111 @@ -353,7 +353,7 @@ #define CT_ERROR_WORDREPL 4051 #define CT_ERROR_WORDSWAP 4061 #define CT_ERROR_WORDTOCHAR 4071 - + /* number and bit manipulation */ #define CT_ERROR_BITTOC 4511 #define CT_ERROR_CELSIUS 4523 @@ -389,7 +389,7 @@ #define CT_ERROR_NUMORX 4822 #define CT_ERROR_NUMROLX 4832 #define CT_ERROR_NUMXORX 4842 - + /* video functions */ #define CT_ERROR_CHARPIX 5012 #define CT_ERROR_CHARWIN 5021 @@ -451,7 +451,7 @@ #define CT_ERROR_VIDEOINIT 5589 #define CT_ERROR_VIDEOSETUP 5592 #define CT_ERROR_VIDEOTYPE 5602 - + /* disc functions */ #define CT_ERROR_DELETEFILE 5712 #define CT_ERROR_DIRCHANGE 5722 @@ -503,12 +503,12 @@ #define CT_ERROR_TRUENAME 6181 #define CT_ERROR_VOLSERIAL 6192 #define CT_ERROR_VOLUME 6204 - + /* printer functions */ -#define CT_ERROR_NUMPRINTER 6412 -#define CT_ERROR_PRINTFILE 6424 -#define CT_ERROR_PRINTINIT 6432 -#define CT_ERROR_PRINTREADY 6444 +#define CT_ERROR_NUMPRINTER 6412 +#define CT_ERROR_PRINTFILE 6424 +#define CT_ERROR_PRINTINIT 6432 +#define CT_ERROR_PRINTREADY 6444 #define CT_ERROR_PRINTSCR 6451 #define CT_ERROR_PRINTSCRX 6464 #define CT_ERROR_PRINTSEND 6472 @@ -604,7 +604,7 @@ #define CT_ERROR_LASTKPROC 7720 #define CT_ERROR_NUMFKEY 7730 #define CT_ERROR_SETLASTKEY 7740 - + /* system info functions */ #define CT_ERROR_BIOSDATE 7810 /* TODO: change last digit */ #define CT_ERROR_BOOTCOLD 7820 @@ -630,7 +630,7 @@ #define CT_ERROR_PCTYPE 8020 #define CT_ERROR_SSETBREAK 8030 #define CT_ERROR_SSETVERIFY 8040 - + /* 3.3 misc. functions */ #define CT_ERROR_ALLOFREE 8110 /* TODO: change last digit */ #define CT_ERROR_BLANK 8120 @@ -654,7 +654,7 @@ #define CT_ERROR_STACKFREE 8300 #define CT_ERROR_TOOLVER 8310 #define CT_ERROR_XTOC 8320 - + /* math functions */ #define CT_ERROR_ACOS 8413 #define CT_ERROR_ASIN 8423 @@ -682,7 +682,7 @@ #define CT_ERROR_SINH 8653 #define CT_ERROR_COSH 8663 #define CT_ERROR_TANH 8673 - + /* peek and poke functions */ #define CT_ERROR_INBYTE 8810 /* TODO: change last digit */ #define CT_ERROR_INWORD 8820 diff --git a/harbour/contrib/hbct/ctnet.c b/harbour/contrib/hbct/ctnet.c index 1905beb3ba..1b87aabcc5 100644 --- a/harbour/contrib/hbct/ctnet.c +++ b/harbour/contrib/hbct/ctnet.c @@ -88,7 +88,7 @@ #include "hbset.h" #include "hbapierr.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) # include # include @@ -167,7 +167,7 @@ HB_FUNC( NETCANCEL ) dwResult = WNetCancelConnection( lpDevice, TRUE ); /* FALSE = fail if exist open files or print jobs. */ HB_TCHAR_FREE( lpDevice ); - /* TRUE = force cancel connection even if exist + /* TRUE = force cancel connection even if exist * open files or print jobs. */ hb_retl( dwResult == NO_ERROR ); diff --git a/harbour/contrib/hbct/ctset.c b/harbour/contrib/hbct/ctset.c index 0e263b059b..6a1df20553 100644 --- a/harbour/contrib/hbct/ctset.c +++ b/harbour/contrib/hbct/ctset.c @@ -55,4 +55,3 @@ #include "ct.h" - diff --git a/harbour/contrib/hbct/ctset.h b/harbour/contrib/hbct/ctset.h index 42d8c427ec..ba89e060ab 100644 --- a/harbour/contrib/hbct/ctset.h +++ b/harbour/contrib/hbct/ctset.h @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * CT3 switch function header * * Copyright 2001 IntTec GmbH, Neunlindenstr 32, 79106 Freiburg, Germany diff --git a/harbour/contrib/hbct/ctstr.h b/harbour/contrib/hbct/ctstr.h index 468741e386..400272a9cf 100644 --- a/harbour/contrib/hbct/ctstr.h +++ b/harbour/contrib/hbct/ctstr.h @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * internal function header for CT3 string functions * * Copyright 2001 IntTec GmbH, Neunlindenstr 32, 79106 Freiburg, Germany diff --git a/harbour/contrib/hbct/cttime.prg b/harbour/contrib/hbct/cttime.prg index cbda9a98b3..b13e0eb12a 100644 --- a/harbour/contrib/hbct/cttime.prg +++ b/harbour/contrib/hbct/cttime.prg @@ -68,7 +68,7 @@ elseif ISCHARACTER( cTime ) isdigit( substr( cTime, i + 1, 1 ) ) .and. ; ( i == nLen - 1 .or. substr( cTime, i + 2, 1 ) == ":" ) .and. ; ( n := val( substr( cTime, i, 2 ) ) ) < aLim[ nInd ] - nSec += n * aMod[ nInd ] + nSec += n * aMod[ nInd ] else nSec := 0 exit diff --git a/harbour/contrib/hbct/cursor.c b/harbour/contrib/hbct/cursor.c index 944a8347a9..a2b0478d05 100644 --- a/harbour/contrib/hbct/cursor.c +++ b/harbour/contrib/hbct/cursor.c @@ -63,7 +63,7 @@ HB_FUNC( SAVECURSOR ) hb_gtGetPos( &sRow, &sCol ); hb_gtGetCursor( &usCursor ); -#ifdef HB_C52_STRICT +#ifdef HB_C52_STRICT usCursor = ( usCursor != 0 ); #endif hb_retnl( ( long ) sCol | ( sRow << 8 ) | ( usCursor << 16 ) ); @@ -75,7 +75,7 @@ HB_FUNC( RESTCURSOR ) long lCursor = hb_parnl( 1 ); hb_gtSetPos( ( SHORT ) ( ( lCursor >> 8 ) & 0xff ), ( SHORT ) ( lCursor & 0xff ) ); -#ifdef HB_C52_STRICT +#ifdef HB_C52_STRICT hb_gtSetCursor( ( USHORT ) ( ( lCursor >> 16 ) & 0x01 ) ); #else hb_gtSetCursor( ( USHORT ) ( ( lCursor >> 16 ) & 0xff ) ); diff --git a/harbour/contrib/hbct/dattime3.c b/harbour/contrib/hbct/dattime3.c index 0def17c26e..e3416a2f01 100644 --- a/harbour/contrib/hbct/dattime3.c +++ b/harbour/contrib/hbct/dattime3.c @@ -1,7 +1,7 @@ /* * $Id$ */ - + /* * Harbour Project source code: * CT3 Date & Time functions: @@ -291,7 +291,7 @@ HB_FUNC( SETTIME ) iTime[0] = iTime[1] = iTime[2] = iTime[3] = 0; if( _hb_timeValid( hb_parc( 1 ), hb_parclen( 1 ), iTime ) ) { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) SYSTEMTIME st; GetLocalTime( &st ); st.wHour = ( WORD ) iTime[0]; @@ -377,7 +377,7 @@ HB_FUNC( SETDATE ) hb_dateDecode( lDate, &iYear, &iMonth, &iDay ); if( iYear >= 1970 ) { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) SYSTEMTIME st; GetLocalTime( &st ); st.wYear = ( WORD ) iYear; diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c index fd77945253..db7c5d34fc 100644 --- a/harbour/contrib/hbct/disk.c +++ b/harbour/contrib/hbct/disk.c @@ -70,7 +70,7 @@ #include "hbapifs.h" #include "ctstrfil.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) # include # include @@ -78,7 +78,7 @@ # define HB_OS_WIN_USED -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) # include @@ -121,7 +121,7 @@ HB_FUNC( DIRNAME ) HB_FUNC( DRIVETYPE ) { -#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE ) ULONG ulSize = hb_parclen( 1 ) + 2; /* allow space for '\0' & ":\" */ char *pszDrive = ( char * ) hb_xgrab( ulSize + 1 ); LPTSTR lpDrive; @@ -246,7 +246,7 @@ HB_FUNC( VOLUME ) if( pszFree ) hb_xfree( pszFree ); } -#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE ) { LPTSTR lpRoot, lpVolName; lpRoot = sRoot ? HB_TCHAR_CONVTO( sRoot ) : NULL; @@ -270,7 +270,7 @@ HB_FUNC( VOLUME ) */ HB_FUNC( GETVOLINFO ) { -#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE ) int iretval; const char *sDrive = hb_parcx( 1 ); TCHAR lpVolName[256]; @@ -307,7 +307,7 @@ HB_FUNC( GETVOLINFO ) HB_FUNC( VOLSERIAL ) { -#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE ) int retval; const char *sDrive = hb_parcx( 1 ); LPTSTR lpDrive; @@ -338,7 +338,7 @@ HB_FUNC( TRUENAME ) if( szFile ) { -#if defined(HB_OS_WIN) && ! defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE ) char *szBuffRet; TCHAR buffer[MAX_PATH + 1] = { 0 }; LPTSTR lpFile; diff --git a/harbour/contrib/hbct/exponent.c b/harbour/contrib/hbct/exponent.c index 0380994c51..737453ef60 100644 --- a/harbour/contrib/hbct/exponent.c +++ b/harbour/contrib/hbct/exponent.c @@ -79,7 +79,7 @@ * * MANTISSA()* 2^EXPONENT() = * - * + * * TODO: add documentation * $EXAMPLES$ * $TESTS$ @@ -175,7 +175,7 @@ HB_FUNC( MANTISSA ) * * 2^EXPONENT() * MANTISSA() = * - * + * * TODO: add documentation * $EXAMPLES$ * $TESTS$ diff --git a/harbour/contrib/hbct/ftoc.c b/harbour/contrib/hbct/ftoc.c index 82c6a0c493..506d9f1d2d 100644 --- a/harbour/contrib/hbct/ftoc.c +++ b/harbour/contrib/hbct/ftoc.c @@ -67,7 +67,7 @@ * * $RETURNS$ * FTOC() return a string with the size of DOUBLE. - * ATTENTION: different implementations or platforms of Harbour, they + * ATTENTION: different implementations or platforms of Harbour, they * could produce different format in the string returned by FTOC(). * * $DESCRIPTION$ @@ -112,7 +112,7 @@ HB_FUNC( FTOC ) * $ARGUMENTS$ * Designate a string that contains a Harbour * number in flotaing point format. - * ATTENTION: different implementations or platforms of Harbour, they + * ATTENTION: different implementations or platforms of Harbour, they * could produce different format in the string returned by FTOC(). * * $RETURNS$ diff --git a/harbour/contrib/hbct/misc1.c b/harbour/contrib/hbct/misc1.c index e80ec3d863..501e6789f0 100644 --- a/harbour/contrib/hbct/misc1.c +++ b/harbour/contrib/hbct/misc1.c @@ -67,7 +67,7 @@ * type: NUMBER, CHARACTER, DATE, LOGICAL. * * $RETURNS$ - * XTOC() return a string with the representation of data type of + * XTOC() return a string with the representation of data type of * expValue. * * $DESCRIPTION$ diff --git a/harbour/contrib/hbct/numconv.prg b/harbour/contrib/hbct/numconv.prg index b2da2456a6..20743f4421 100644 --- a/harbour/contrib/hbct/numconv.prg +++ b/harbour/contrib/hbct/numconv.prg @@ -171,7 +171,7 @@ RETURN nNum STATIC FUNCTION B10TOBN( nNum, nBase ) LOCAL nInt IF nNum > 0 - + nInt := INT( nNum / nBase) RETURN iif(nInt==0, "", B10TOBN( nInt, @nBase )) +; SUBSTR( WORLD, ( nNum % nBase ) + 1, 1 ) @@ -219,13 +219,13 @@ FUNCTION BITTOC( nInteger, cBitPattern, lMode ) cBinary := NTOC( nInteger, 2, 16 ) FOR nI := 1 TO 16 - + IF SUBSTR( cBinary, -nI, 1 ) == '1' cString := SUBSTR( cBitPattern, -nI, 1 ) + cString ELSEIF lMode - + cString := ' ' + cString ENDIF diff --git a/harbour/contrib/hbct/print.c b/harbour/contrib/hbct/print.c index 50505b0c1a..fbc2721f4e 100644 --- a/harbour/contrib/hbct/print.c +++ b/harbour/contrib/hbct/print.c @@ -94,7 +94,7 @@ HB_FUNC( PRINTSTAT ) USHORT uiPort = HB_ISNUM( 1 ) ? ( USHORT ) hb_parni( 1 ) : 1; int Status = 0; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) /* NOTE: DOS specific solution, using BIOS interrupt */ @@ -145,7 +145,7 @@ HB_FUNC( PRINTREADY ) USHORT uiPort = HB_ISNUM( 1 ) ? ( USHORT ) hb_parni( 1 ) : 1; int Status = 0; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) /* NOTE: DOS specific solution, using BIOS interrupt */ diff --git a/harbour/contrib/hbcurl/hbcurl.ch b/harbour/contrib/hbcurl/hbcurl.ch index fed6276deb..0f86041dad 100644 --- a/harbour/contrib/hbcurl/hbcurl.ch +++ b/harbour/contrib/hbcurl/hbcurl.ch @@ -109,7 +109,7 @@ #define HB_CURLOPT_FTPLISTONLY HB_CURLOPT_DIRLISTONLY #define HB_CURLOPT_APPEND 50 /* Append instead of overwrite on upload! */ #define HB_CURLOPT_FTPAPPEND HB_CURLOPT_APPEND -#define HB_CURLOPT_NETRC 51 +#define HB_CURLOPT_NETRC 51 #define HB_CURLOPT_FOLLOWLOCATION 52 /* use Location: Luke! */ #define HB_CURLOPT_TRANSFERTEXT 53 /* transfer data in text/ASCII format */ #define HB_CURLOPT_PUT 54 /* HTTP PUT */ @@ -322,16 +322,16 @@ #define HB_CURL_CURLSSH_AUTH_DEFAULT HB_CURLSSH_AUTH_ANY /* curl_easy_pause() parameters. They can be combined with hb_BitOr(). */ -#define HB_CURLPAUSE_RECV 1 +#define HB_CURLPAUSE_RECV 1 #define HB_CURLPAUSE_RECV_CONT 0 -#define HB_CURLPAUSE_SEND 4 +#define HB_CURLPAUSE_SEND 4 #define HB_CURLPAUSE_SEND_CONT 0 #define HB_CURLPAUSE_ALL hb_BitOr( HB_CURLPAUSE_RECV, HB_CURLPAUSE_SEND ) #define HB_CURLPAUSE_CONT hb_BitOr( HB_CURLPAUSE_RECV_CONT, HB_CURLPAUSE_SEND_CONT ) /* curl_global_init() parameters. */ -#define HB_CURL_GLOBAL_SSL 1 -#define HB_CURL_GLOBAL_WIN32 2 +#define HB_CURL_GLOBAL_SSL 1 +#define HB_CURL_GLOBAL_WIN32 2 #define HB_CURL_GLOBAL_ALL hb_BitOr( HB_CURL_GLOBAL_SSL, HB_CURL_GLOBAL_WIN32 ) #define HB_CURL_GLOBAL_NOTHING 0 #define HB_CURL_GLOBAL_DEFAULT HB_CURL_GLOBAL_ALL diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c index 21a8d1b4f7..2a21739c9d 100644 --- a/harbour/contrib/hbfimage/fi_winfu.c +++ b/harbour/contrib/hbfimage/fi_winfu.c @@ -55,9 +55,9 @@ #include "hbapi.h" #include "hbapierr.h" -#if defined(HB_OS_WIN) && ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) ) +#if defined( HB_OS_WIN ) && ! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) -#if !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) || defined(__WATCOMC__) +#if !defined( _WINDOWS_ ) && ( defined( __GNUC__ ) || defined( __POCC__ ) || defined( __XCC__ ) ) || defined( __WATCOMC__ ) #define _WINDOWS_ #endif @@ -210,4 +210,4 @@ HB_FUNC( FI_WINDRAW ) /* -------------------------------------------------------------------------- */ -#endif /* defined(HB_OS_WIN) */ +#endif /* defined( HB_OS_WIN ) */ diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index bc02a640e4..b38980ebec 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -57,7 +57,7 @@ #include "hbapierr.h" #include "hbvm.h" -#if defined(HB_OS_WIN) && !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) || defined(__WATCOMC__) +#if defined( HB_OS_WIN ) && !defined( _WINDOWS_ ) && ( defined( __GNUC__ ) || defined( __POCC__ ) || defined( __XCC__ ) ) || defined( __WATCOMC__ ) #define _WINDOWS_ #endif diff --git a/harbour/contrib/hbgd/gd.ch b/harbour/contrib/hbgd/gd.ch index a0466e07e3..ea466c0677 100644 --- a/harbour/contrib/hbgd/gd.ch +++ b/harbour/contrib/hbgd/gd.ch @@ -60,7 +60,7 @@ #define GD_CH -#if ( defined(HB_OS_WIN) || defined(__WIN32__) ) +#if ( defined( HB_OS_WIN ) || defined( __WIN32__ ) ) #define GD_VERS 2033 #else #define GD_VERS 2028 diff --git a/harbour/contrib/hbgd/gdchart.prg b/harbour/contrib/hbgd/gdchart.prg index 6970a2eda2..bf12cdfcf3 100644 --- a/harbour/contrib/hbgd/gdchart.prg +++ b/harbour/contrib/hbgd/gdchart.prg @@ -932,4 +932,3 @@ STATIC FUNCTION HGetValue( hHash, cKey ) xVal := IIF( ( nPos := HB_HPos( hHash, cKey )) == 0, NIL, HB_HValueAt( hHash, nPos) ) ENDIF RETURN xVal - diff --git a/harbour/contrib/hbgd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg index 3675ecc9df..828b17f2f8 100644 --- a/harbour/contrib/hbgd/gdimage.prg +++ b/harbour/contrib/hbgd/gdimage.prg @@ -697,4 +697,3 @@ METHOD CloneDataFrom( oSrc ) ::cMime := oSrc:cMime RETURN Self - diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 2266887645..ee9380ab99 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -56,11 +56,11 @@ #include "hbapifs.h" /* NOTE: Do some initialization required by the GD headers. */ -#if defined(HB_OS_WIN) - #if !defined(WIN32) +#if defined( HB_OS_WIN ) + #if !defined( WIN32 ) #define WIN32 #endif - #if !defined(BGDWIN32) + #if !defined( BGDWIN32 ) #define BGDWIN32 #endif #endif diff --git a/harbour/contrib/hbmisc/nconvert.prg b/harbour/contrib/hbmisc/nconvert.prg index db1ac57b10..20f87b2379 100644 --- a/harbour/contrib/hbmisc/nconvert.prg +++ b/harbour/contrib/hbmisc/nconvert.prg @@ -143,7 +143,7 @@ FUNCTION OctalToDec(cString) (8**(nLen-nX)) NEXT nX RETURN(nNumber) - + FUNCTION HexaToDec(cString) local nNumber:=0,nX local cNewString:=AllTrim(cString) @@ -153,5 +153,3 @@ FUNCTION HexaToDec(cString) (16**(nLen-nX)) NEXT nX RETURN nNumber - - diff --git a/harbour/contrib/hbmisc/spd.c b/harbour/contrib/hbmisc/spd.c index 6c5ab1c1c9..001faa20f8 100644 --- a/harbour/contrib/hbmisc/spd.c +++ b/harbour/contrib/hbmisc/spd.c @@ -81,7 +81,7 @@ static ULONG SCItm( char *cBuffer, ULONG ulMaxBuf, char *cParFrm, int iCOut, int /* NOTE: In DJGPP (4.2.3) hb_snprintf() will be preprocessed to sprintf(), which makes ulMaxBuf unused, and this in turn causes a warning, so we're manually suppressing it. [vszakats] */ - #if defined(__DJGPP__) + #if defined( __DJGPP__ ) HB_SYMBOL_UNUSED( ulMaxBuf ); #endif diff --git a/harbour/contrib/hbmisc/stringp.prg b/harbour/contrib/hbmisc/stringp.prg index e660e20f72..395cb4367a 100644 --- a/harbour/contrib/hbmisc/stringp.prg +++ b/harbour/contrib/hbmisc/stringp.prg @@ -170,6 +170,3 @@ function Debug( xItem ) QOut( ToChar( xItem, ", ", .T. ) ) return xItem - - - diff --git a/harbour/contrib/hbmisc/stringsx.c b/harbour/contrib/hbmisc/stringsx.c index bae5bbf54e..0ad641dc81 100644 --- a/harbour/contrib/hbmisc/stringsx.c +++ b/harbour/contrib/hbmisc/stringsx.c @@ -17,7 +17,7 @@ static const char *hb_strtoken(const char *szText, long wCounter = 0; HB_TRACE(HB_TR_DEBUG, ("hb_strtoken(%s, %ld, %ld, %d, %p)", szText, lText, lIndex, (int) cDelimiter, lLen)); - + do { wStart = wEnd; diff --git a/harbour/contrib/hbmysql/mysql.c b/harbour/contrib/hbmysql/mysql.c index 30c2b8d740..a74cb0ce11 100644 --- a/harbour/contrib/hbmysql/mysql.c +++ b/harbour/contrib/hbmysql/mysql.c @@ -65,7 +65,7 @@ #include "hbapiitm.h" #include "hbapifs.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) /* NOTE: To satisfy MySQL headers. */ #include #endif diff --git a/harbour/contrib/hbmysql/mysqlold.c b/harbour/contrib/hbmysql/mysqlold.c index 86d82ccd49..3501d5f843 100644 --- a/harbour/contrib/hbmysql/mysqlold.c +++ b/harbour/contrib/hbmysql/mysqlold.c @@ -52,7 +52,7 @@ #include "hbapi.h" -#if !defined(HB_MYSQL_LEGACY_LEVEL_OFF) +#if !defined( HB_MYSQL_LEGACY_LEVEL_OFF ) HB_FUNC_EXTERN( MYSQL_GET_SERVER_VERSION ) ; HB_FUNC( SQLVERSION ) { HB_FUNC_EXEC( MYSQL_GET_SERVER_VERSION ); } HB_FUNC_EXTERN( MYSQL_REAL_CONNECT ) ; HB_FUNC( SQLCONNECT ) { HB_FUNC_EXEC( MYSQL_REAL_CONNECT ); } diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c index ffcf964fb9..e3248d77c2 100644 --- a/harbour/contrib/hbmzip/hbmzip.c +++ b/harbour/contrib/hbmzip/hbmzip.c @@ -70,7 +70,7 @@ #include #include #elif defined( HB_OS_DOS ) - #if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__) + #if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ ) #include "hb_io.h" #include #if defined( HB_OS_DOS ) @@ -781,7 +781,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz } #elif defined( HB_OS_DOS ) { -# if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__) +# if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ ) int attr; attr = _chmod( szFileName, 0, 0 ); @@ -1163,7 +1163,7 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, const char* szFileName, c } #elif defined( HB_OS_DOS ) -# if defined(__RSX32__) || defined(__GNUC__) +# if defined( __RSX32__ ) || defined( __GNUC__ ) _chmod( szName, 1, ufi.external_fa & 0xFF ); # else hb_fsSetAttr( szName, ufi.external_fa & 0xFF ); diff --git a/harbour/contrib/hbnf/aavg.prg b/harbour/contrib/hbnf/aavg.prg index a55743d9c3..f2df1d6795 100644 --- a/harbour/contrib/hbnf/aavg.prg +++ b/harbour/contrib/hbnf/aavg.prg @@ -69,7 +69,7 @@ [; := iif( == NIL,,)] - + FUNCTION FT_AAVG(aArray, nStartIndex, nEndIndex) DEFAULT nStartIndex TO 1, ; diff --git a/harbour/contrib/hbnf/acctadj.prg b/harbour/contrib/hbnf/acctadj.prg index 51eb6f9e6c..0a80e48930 100644 --- a/harbour/contrib/hbnf/acctadj.prg +++ b/harbour/contrib/hbnf/acctadj.prg @@ -88,26 +88,26 @@ * FT_DATECNFG() FT_DAYTOBOW() * $END$ */ - + FUNCTION FT_ACCTADJ(dGivenDate, lIsEnd) - + LOCAL nTemp - + IF !( VALTYPE(dGivenDate) == "D" ) dGivenDate := DATE() ENDIF lIsEnd := VALTYPE(lIsEnd) == "L" nTemp := FT_DAYTOBOW(dGivenDate) - + IF nTemp > ( 2 + IF(!lIsEnd, 1, 0) ) dGivenDate += ( 7 - nTemp ) // Next Week Start (This Week End + 1) ELSE dGivenDate -= nTemp // This Week Start (Prior Week End + 1) ENDIF - + IF lIsEnd dGivenDate-- ENDIF - + RETURN dGivenDate diff --git a/harbour/contrib/hbnf/acctmnth.prg b/harbour/contrib/hbnf/acctmnth.prg index 59838c20fc..6af0a520ae 100644 --- a/harbour/contrib/hbnf/acctmnth.prg +++ b/harbour/contrib/hbnf/acctmnth.prg @@ -80,23 +80,23 @@ * FT_DATECNFG() FT_ACCTWEEK() FT_ACCTQTR() FT_ACCTYEAR() * $END$ */ - + FUNCTION FT_ACCTMONTH(dGivenDate,nMonthNum) LOCAL nYTemp, nMTemp, lIsMonth, aRetVal - + IF ! ( VALTYPE(dGivenDate) $ 'ND' ) dGivenDate := DATE() ELSEIF VALTYPE(dGivenDate) == 'N' nMonthNum := dGivenDate dGivenDate := DATE() ENDIF - + aRetVal := FT_MONTH(dGivenDate) nYTemp := VAL(SUBSTR(aRetVal[1],1,4)) nMTemp := VAL(SUBSTR(aRetVal[1],5,2)) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + IF dGivenDate < aRetVal[2] dGivenDate := FT_MADD(dGivenDate, -1) aRetVal := FT_MONTH(dGivenDate) @@ -107,9 +107,9 @@ FUNCTION FT_ACCTMONTH(dGivenDate,nMonthNum) ENDIF aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + ELSEIF dGivenDate > aRetVal[3] - + dGivenDate := FT_MADD(dGivenDate, 1) aRetVal := FT_MONTH(dGivenDate) nMTemp += 1 @@ -119,9 +119,9 @@ FUNCTION FT_ACCTMONTH(dGivenDate,nMonthNum) ENDIF aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + ENDIF - + lIsMonth := ( VALTYPE(nMonthNum) == 'N' ) IF lIsMonth IF nMonthNum < 1 .OR. nMonthNum > 12 @@ -133,7 +133,7 @@ FUNCTION FT_ACCTMONTH(dGivenDate,nMonthNum) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) ENDIF - + aRetVal[1] := STR(nYTemp,4) + PADL(LTRIM(STR(nMTemp,2)), 2, '0') - + RETURN aRetVal diff --git a/harbour/contrib/hbnf/acctqtr.prg b/harbour/contrib/hbnf/acctqtr.prg index cb5d1ada00..5aa43be9b3 100644 --- a/harbour/contrib/hbnf/acctqtr.prg +++ b/harbour/contrib/hbnf/acctqtr.prg @@ -80,10 +80,10 @@ * FT_DATECNFG() FT_ACCTWEEK() FT_ACCTMONTH() FT_ACCTYEAR() * $END$ */ - + FUNCTION FT_ACCTQTR(dGivenDate,nQtrNum) LOCAL nYTemp, nQTemp, lIsQtr, aRetVal - + IF ! ( VALTYPE(dGivenDate) $ 'ND' ) dGivenDate := DATE() ELSEIF VALTYPE(dGivenDate) == 'N' @@ -95,7 +95,7 @@ FUNCTION FT_ACCTQTR(dGivenDate,nQtrNum) nQTemp := VAL(SUBSTR(aRetVal[1],5,2)) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + IF dGivenDate < aRetVal[2] dGivenDate := FT_MADD(dGivenDate, -1) aRetVal := FT_QTR(dGivenDate) @@ -106,9 +106,9 @@ FUNCTION FT_ACCTQTR(dGivenDate,nQtrNum) ENDIF aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + ELSEIF dGivenDate > aRetVal[3] - + dGivenDate := FT_MADD(dGivenDate,1) aRetVal := FT_QTR(dGivenDate) nQTemp += 1 @@ -118,9 +118,9 @@ FUNCTION FT_ACCTQTR(dGivenDate,nQtrNum) ENDIF aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + ENDIF - + lIsQtr := ( VALTYPE(nQtrNum) == 'N' ) IF lIsQtr IF nQtrNum < 1 .OR. nQtrNum > 4 @@ -132,9 +132,7 @@ FUNCTION FT_ACCTQTR(dGivenDate,nQtrNum) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) ENDIF - + aRetVal[1] := STR(nYTemp,4) + PADL(LTRIM(STR(nQTemp,2)), 2, '0') - + RETURN aRetVal - - diff --git a/harbour/contrib/hbnf/acctweek.prg b/harbour/contrib/hbnf/acctweek.prg index fab4b594d0..21c6c71e4c 100644 --- a/harbour/contrib/hbnf/acctweek.prg +++ b/harbour/contrib/hbnf/acctweek.prg @@ -80,20 +80,20 @@ * FT_DATECNFG() FT_ACCTMONTH() FT_ACCTQTR() FT_ACCTYEAR() * $END$ */ - + FUNCTION FT_ACCTWEEK(dGivenDate,nWeekNum) - + LOCAL nTemp, lIsWeek, aRetVal - + IF ! VALTYPE(dGivenDate) $ 'ND' dGivenDate := DATE() ELSEIF VALTYPE(dGivenDate) == 'N' nWeekNum := dGivenDate dGivenDate := DATE() ENDIF - + aRetVal := FT_ACCTYEAR(dGivenDate) - + lIsWeek := ( VALTYPE(nWeekNum) == 'N' ) IF lIsWeek nTemp := INT( (aRetVal[3] - aRetVal[2]) / 7 ) + 1 @@ -102,12 +102,11 @@ FUNCTION FT_ACCTWEEK(dGivenDate,nWeekNum) ENDIF dGivenDate := aRetVal[2] + (nWeekNum - 1) * 7 ENDIF - + aRetVal[1] += PADL(LTRIM(STR(INT( (dGivenDate - ; aRetVal[2]) / 7 ) + 1, 2)), 2, '0') dGivenDate += ( 6 - FT_DAYTOBOW(dGivenDate) ) // end of week aRetVal[2] := dGivenDate - 6 aRetVal[3] := dGivenDate - -RETURN aRetVal +RETURN aRetVal diff --git a/harbour/contrib/hbnf/acctyear.prg b/harbour/contrib/hbnf/acctyear.prg index c89ea4e1a5..d9841fce40 100644 --- a/harbour/contrib/hbnf/acctyear.prg +++ b/harbour/contrib/hbnf/acctyear.prg @@ -71,20 +71,20 @@ * FT_DATECNFG() FT_ACCTWEEK() FT_ACCTMONTH() FT_ACCTQTR() * $END$ */ - + FUNCTION FT_ACCTYEAR(dGivenDate) - + LOCAL nYTemp, aRetVal - + IF !( VALTYPE(dGivenDate) == "D" ) dGivenDate := DATE() ENDIF - + aRetVal := FT_YEAR(dGivenDate) nYTemp := VAL(aRetVal[1]) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) - + IF dGivenDate < aRetVal[2] aRetVal := FT_YEAR(FT_MADD(dGivenDate, -1)) nYTemp -- @@ -96,9 +96,7 @@ FUNCTION FT_ACCTYEAR(dGivenDate) aRetVal[2] := FT_ACCTADJ(aRetVal[2]) aRetVal[3] := FT_ACCTADJ(aRetVal[3], .T. ) ENDIF - + aRetVal[1] := STR(nYTemp,4) - + RETURN aRetVal - - diff --git a/harbour/contrib/hbnf/aemaxlen.prg b/harbour/contrib/hbnf/aemaxlen.prg index 1d8db4417f..c65197ffd5 100644 --- a/harbour/contrib/hbnf/aemaxlen.prg +++ b/harbour/contrib/hbnf/aemaxlen.prg @@ -134,4 +134,3 @@ FUNCTION FT_AEmaxlen( aArray, nDimension, nStart, nCount ) NEXT RETURN ( nMaxlen ) - diff --git a/harbour/contrib/hbnf/aeminlen.prg b/harbour/contrib/hbnf/aeminlen.prg index 3a786c98cf..9e9365e179 100644 --- a/harbour/contrib/hbnf/aeminlen.prg +++ b/harbour/contrib/hbnf/aeminlen.prg @@ -135,4 +135,3 @@ FUNCTION FT_AEminlen( aArray, nDimension, nStart, nCount ) NEXT RETURN ( nMinlen ) - diff --git a/harbour/contrib/hbnf/amedian.prg b/harbour/contrib/hbnf/amedian.prg index 0a404692d7..c2090250b4 100644 --- a/harbour/contrib/hbnf/amedian.prg +++ b/harbour/contrib/hbnf/amedian.prg @@ -133,4 +133,3 @@ FUNCTION FT_AMEDIAN( aArray, nStart, nEnd ) ENDIF RETURN ( nMedian ) - diff --git a/harbour/contrib/hbnf/asum.prg b/harbour/contrib/hbnf/asum.prg index d10da878ea..1c722c2d69 100644 --- a/harbour/contrib/hbnf/asum.prg +++ b/harbour/contrib/hbnf/asum.prg @@ -88,4 +88,3 @@ FUNCTION FT_ASUM(aArray, nStartIndex, nEndIndex) nStartIndex, nEndIndex - nStartIndex + 1) RETURN (nSumTotal) // FT_ASum - diff --git a/harbour/contrib/hbnf/bitclr.prg b/harbour/contrib/hbnf/bitclr.prg index 47e26d7d4d..c73044484d 100644 --- a/harbour/contrib/hbnf/bitclr.prg +++ b/harbour/contrib/hbnf/bitclr.prg @@ -86,4 +86,3 @@ FUNCTION FT_BITCLR(cInbyte, nBitpos) ENDIF RETURN cByte - diff --git a/harbour/contrib/hbnf/bitset.prg b/harbour/contrib/hbnf/bitset.prg index fbd55488cf..2b4f2e7425 100644 --- a/harbour/contrib/hbnf/bitset.prg +++ b/harbour/contrib/hbnf/bitset.prg @@ -88,4 +88,3 @@ FUNCTION FT_BITSET(cInByte, nBitpos) ENDIF RETURN cByte - diff --git a/harbour/contrib/hbnf/blink.prg b/harbour/contrib/hbnf/blink.prg index 427ea0c3c4..64c5d6f59a 100644 --- a/harbour/contrib/hbnf/blink.prg +++ b/harbour/contrib/hbnf/blink.prg @@ -80,4 +80,3 @@ FUNCTION FT_BLINK( cMsg, nRow, nCol ) SETCOLOR( cSavColor ) // It's a wrap, restore colors & exit. RETURN NIL - diff --git a/harbour/contrib/hbnf/byteand.prg b/harbour/contrib/hbnf/byteand.prg index d0eec06519..05d17f7c01 100644 --- a/harbour/contrib/hbnf/byteand.prg +++ b/harbour/contrib/hbnf/byteand.prg @@ -81,4 +81,3 @@ FUNCTION FT_BYTEAND(cByte1, cByte2) ENDIF RETURN cNewByte - diff --git a/harbour/contrib/hbnf/byteneg.prg b/harbour/contrib/hbnf/byteneg.prg index 643c03673a..f623622650 100644 --- a/harbour/contrib/hbnf/byteneg.prg +++ b/harbour/contrib/hbnf/byteneg.prg @@ -65,4 +65,3 @@ FUNCTION FT_BYTENEG(cByte) RETURN iif(valtype(cByte) != "C", NIL, chr((256 - asc(cByte)) % 256)) - diff --git a/harbour/contrib/hbnf/bytenot.prg b/harbour/contrib/hbnf/bytenot.prg index 1fbb47875f..99b059c1f2 100644 --- a/harbour/contrib/hbnf/bytenot.prg +++ b/harbour/contrib/hbnf/bytenot.prg @@ -80,4 +80,3 @@ FUNCTION FT_BYTENOT(cByte) ENDIF RETURN cNewByte - diff --git a/harbour/contrib/hbnf/byteor.prg b/harbour/contrib/hbnf/byteor.prg index 5acc7bcd0e..789ae9f99b 100644 --- a/harbour/contrib/hbnf/byteor.prg +++ b/harbour/contrib/hbnf/byteor.prg @@ -79,4 +79,3 @@ FUNCTION FT_BYTEOR(cByte1, cByte2) ENDIF RETURN cNewByte - diff --git a/harbour/contrib/hbnf/bytexor.prg b/harbour/contrib/hbnf/bytexor.prg index 0d5e2bf01b..8088683803 100644 --- a/harbour/contrib/hbnf/bytexor.prg +++ b/harbour/contrib/hbnf/bytexor.prg @@ -84,4 +84,3 @@ FUNCTION FT_BYTEXOR(cByte1, cByte2) ENDIF RETURN cNewByte - diff --git a/harbour/contrib/hbnf/clrsel.prg b/harbour/contrib/hbnf/clrsel.prg index e0b4ce4fce..68f1cc6528 100644 --- a/harbour/contrib/hbnf/clrsel.prg +++ b/harbour/contrib/hbnf/clrsel.prg @@ -350,7 +350,7 @@ STATIC FUNCTION _ftColours( aOpt, aClrPal, lColour ) LOCAL nB, nT, nL, nR LOCAL nX LOCAL aClrs := {} -LOCAL cClr +LOCAL cClr LOCAL nChoice := 1 LOCAL aPrompt LOCAL nLen := 0 @@ -559,7 +559,7 @@ STATIC FUNCTION _ftClrSel( aClrPal, cClr, nElem, aOpt ) // cClr is the current colour being modified // Return -> selected colour combination -LOCAL nR +LOCAL nR LOCAL nC := 1 LOCAL lFound := .F. LOCAL nKey @@ -788,4 +788,3 @@ DO WHILE lIdentical .AND. n <= LEN(aArr1) ENDDO RETURN lIdentical - diff --git a/harbour/contrib/hbnf/d2e.prg b/harbour/contrib/hbnf/d2e.prg index a1528b5a25..32da2ee4e5 100644 --- a/harbour/contrib/hbnf/d2e.prg +++ b/harbour/contrib/hbnf/d2e.prg @@ -91,4 +91,3 @@ function ft_d2e( nDec, nPrecision ) sScn := ltrim( str( nDec, nPrecision + 3, nPrecision ) ) return( sScn + 'E' + alltrim( str( nExp, 5, 0 ) ) ) - diff --git a/harbour/contrib/hbnf/datecnfg.prg b/harbour/contrib/hbnf/datecnfg.prg index 5a8c7065e4..91ac2dd1ed 100644 --- a/harbour/contrib/hbnf/datecnfg.prg +++ b/harbour/contrib/hbnf/datecnfg.prg @@ -332,4 +332,3 @@ FUNCTION FT_DATECNFG( cFYStart ,nDow ) ENDIF RETURN ACLONE( aDatePar ) - diff --git a/harbour/contrib/hbnf/descendn.c b/harbour/contrib/hbnf/descendn.c index 5292439fdf..7ef33d3514 100644 --- a/harbour/contrib/hbnf/descendn.c +++ b/harbour/contrib/hbnf/descendn.c @@ -50,7 +50,7 @@ HB_FUNC( FT_DESCEND ) { -#if defined(HB_OS_DOS) || defined(HB_OS_WIN) +#if defined( HB_OS_DOS ) || defined( HB_OS_WIN ) { PHB_ITEM iP = hb_itemParam( 1 ); HB_TYPE uiType = hb_itemType( iP ); diff --git a/harbour/contrib/hbnf/diskfunc.prg b/harbour/contrib/hbnf/diskfunc.prg index 53df4876b6..b46d149934 100644 --- a/harbour/contrib/hbnf/diskfunc.prg +++ b/harbour/contrib/hbnf/diskfunc.prg @@ -102,4 +102,3 @@ FUNCTION FT_DSKFREE( cDrive ) RETURN DISKSPACE(nDrive,1) - diff --git a/harbour/contrib/hbnf/dosver.prg b/harbour/contrib/hbnf/dosver.prg index 02d6e77040..a075fbc603 100644 --- a/harbour/contrib/hbnf/dosver.prg +++ b/harbour/contrib/hbnf/dosver.prg @@ -84,4 +84,3 @@ FUNCTION FT_DOSVER() */ cResult:= _get_dosver() RETURN ( cResult ) - diff --git a/harbour/contrib/hbnf/firstday.prg b/harbour/contrib/hbnf/firstday.prg index ae6cd5fa68..49f4e099ed 100644 --- a/harbour/contrib/hbnf/firstday.prg +++ b/harbour/contrib/hbnf/firstday.prg @@ -60,4 +60,3 @@ FUNCTION FT_FDAY(dDateToChk) ENDIF RETURN dDateToChk - (DAY(dDateToChk)-1) - diff --git a/harbour/contrib/hbnf/ftmenuto.ch b/harbour/contrib/hbnf/ftmenuto.ch index 529cb7f215..192de3725e 100644 --- a/harbour/contrib/hbnf/ftmenuto.ch +++ b/harbour/contrib/hbnf/ftmenuto.ch @@ -71,4 +71,3 @@ #xcommand MENU TO [] => ; := FT_MenuTo( {|_1| iif( _1 == NIL, , := _1 ) }, #, <.l.> ) - diff --git a/harbour/contrib/hbnf/ftshadow.c b/harbour/contrib/hbnf/ftshadow.c index 94384e244f..d002a9afd0 100644 --- a/harbour/contrib/hbnf/ftshadow.c +++ b/harbour/contrib/hbnf/ftshadow.c @@ -63,9 +63,9 @@ HB_FUNC( FT_SHADOW ) HB_FUNC( FT_SETATTR ) { - hb_gtSetAttribute( ( SHORT ) hb_parni( 1 ), + hb_gtSetAttribute( ( SHORT ) hb_parni( 1 ), ( SHORT ) hb_parni( 2 ), - ( SHORT ) hb_parni( 3 ), - ( SHORT ) hb_parni( 4 ), + ( SHORT ) hb_parni( 3 ), + ( SHORT ) hb_parni( 4 ), ( BYTE ) hb_parni( 5 ) ); } diff --git a/harbour/contrib/hbnf/fttext.c b/harbour/contrib/hbnf/fttext.c index 9bb28778cc..e2be9c905d 100644 --- a/harbour/contrib/hbnf/fttext.c +++ b/harbour/contrib/hbnf/fttext.c @@ -178,7 +178,7 @@ #include "hbapifs.h" /* MSC compiler switch */ -#if defined(_MSC_VER) +#if defined( _MSC_VER ) #pragma warning( disable : 4035 ) #pragma warning( disable : 4704 ) #endif diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c index 7e9028d512..2c2a7a6272 100644 --- a/harbour/contrib/hbnf/getenvrn.c +++ b/harbour/contrib/hbnf/getenvrn.c @@ -94,7 +94,7 @@ #define HB_OS_WIN_USED #include "hbapi.h" -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) # include # if defined( HB_OS_DARWIN ) # include @@ -102,10 +102,10 @@ # elif !defined( __WATCOMC__ ) extern char **environ; # endif -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) # define environ _environ extern char **_environ; -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) # include #endif @@ -116,7 +116,7 @@ extern char **_environ; HB_FUNC( FT_GETE ) { -#if defined(HB_OS_DOS) || defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_DOS ) || defined( HB_OS_UNIX_COMPATIBLE ) { char *buffer = NULL; int x; @@ -171,7 +171,7 @@ HB_FUNC( FT_GETE ) /* return number of strings found */ hb_retni( x ); } -#elif defined(HB_OS_WIN) && ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) ) +#elif defined( HB_OS_WIN ) && ! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) { char *buffer = NULL; LPTCH lpEnviron = GetEnvironmentStrings(); diff --git a/harbour/contrib/hbnf/getver.c b/harbour/contrib/hbnf/getver.c index 4861cc018d..5853a21455 100644 --- a/harbour/contrib/hbnf/getver.c +++ b/harbour/contrib/hbnf/getver.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapiitm.h" -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) #include "dos.h" #endif #include "string.h" @@ -61,7 +61,7 @@ HB_FUNC( _GET_DOSVER ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { char * pszPlatform; union REGS regs; @@ -80,7 +80,7 @@ HB_FUNC( _GET_DOSVER ) HB_FUNC( _FT_ISSHARE ) { int iShare; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1000; @@ -100,7 +100,7 @@ HB_FUNC( _FT_ISSHARE ) HB_FUNC( _FT_NWKSTAT ) { int iConnect; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0xDC; @@ -117,7 +117,7 @@ HB_FUNC( _FT_NWKSTAT ) HB_FUNC( _FT_SETMODE ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.h.ah = 0; @@ -130,7 +130,7 @@ HB_FUNC( _FT_SETMODE ) HB_FUNC( _FT_GETMODE ) { int iMode; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.h.ah = 0x0F; @@ -151,7 +151,7 @@ HB_FUNC( _FT_TEMPFIL ) int iflags; const char * cPath; -#if defined(HB_OS_DOS) && !defined(HB_OS_DOS_32) +#if defined( HB_OS_DOS ) && !defined( HB_OS_DOS_32 ) { int iMode = hb_parni( 2 ); union REGS regs; diff --git a/harbour/contrib/hbnf/getvid.c b/harbour/contrib/hbnf/getvid.c index b8b7f35689..a9a4b32f8d 100644 --- a/harbour/contrib/hbnf/getvid.c +++ b/harbour/contrib/hbnf/getvid.c @@ -52,7 +52,7 @@ */ #include "hbapi.h" -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) #include "dos.h" #endif @@ -60,7 +60,7 @@ HB_FUNC( _FT_GETVPG ) { int iPage; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS registers; registers.h.ah = 0x0F; @@ -78,7 +78,7 @@ HB_FUNC( _FT_GETVPG ) HB_FUNC( _V_SETVPG ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { int iPage; union REGS registers; diff --git a/harbour/contrib/hbnf/iamidle.c b/harbour/contrib/hbnf/iamidle.c index 1208109ea9..0164a5d2c4 100644 --- a/harbour/contrib/hbnf/iamidle.c +++ b/harbour/contrib/hbnf/iamidle.c @@ -50,7 +50,7 @@ * */ -/* +/* * File......: adapter.asm * Author....: Ted Means * CIS ID....: 73067,3332 @@ -96,7 +96,7 @@ * * Here's another way to do it: * * FT_OnIdle( {|| FT_IAmIdle()} ) -* +* * Inkey( 0 ) // Automatically reports idleness until key * // is pressed! * $SEEALSO$ diff --git a/harbour/contrib/hbnf/isbit.prg b/harbour/contrib/hbnf/isbit.prg index 47be3affb0..5e7b4c8ab5 100644 --- a/harbour/contrib/hbnf/isbit.prg +++ b/harbour/contrib/hbnf/isbit.prg @@ -85,4 +85,3 @@ FUNCTION FT_ISBIT(cInbyte,nBitPos) ENDIF RETURN lBitStat - diff --git a/harbour/contrib/hbnf/isshare.prg b/harbour/contrib/hbnf/isshare.prg index b0a64cc1eb..be03246e35 100644 --- a/harbour/contrib/hbnf/isshare.prg +++ b/harbour/contrib/hbnf/isshare.prg @@ -91,4 +91,3 @@ FUNCTION ft_isshare() RETURN lowbyte( aRegs[AX] ) */ RETURN _ft_isshare() - diff --git a/harbour/contrib/hbnf/kspeed.c b/harbour/contrib/hbnf/kspeed.c index e5d31ef7bf..5551b6cd8a 100644 --- a/harbour/contrib/hbnf/kspeed.c +++ b/harbour/contrib/hbnf/kspeed.c @@ -2,7 +2,7 @@ * $Id$ */ -/* +/* * File......: kspeed.asm * Author....: James R. Zack * CIS ID....: 75410,1567 @@ -145,13 +145,13 @@ _NanFor ENDS /* This is the New one Rewriten in C*/ #include "hbapi.h" -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) #include "dos.h" #endif HB_FUNC( FT_SETRATE ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS registers; int tempo = 0, nrepete = 0; diff --git a/harbour/contrib/hbnf/madd.prg b/harbour/contrib/hbnf/madd.prg index d09baf20c5..30985a4551 100644 --- a/harbour/contrib/hbnf/madd.prg +++ b/harbour/contrib/hbnf/madd.prg @@ -103,4 +103,3 @@ FUNCTION FT_MADD( dGivenDate, nAddMonths, lMakeEOM) ENDIF RETURN dTemp - diff --git a/harbour/contrib/hbnf/menu1.prg b/harbour/contrib/hbnf/menu1.prg index fa92afe96e..fe640058e0 100644 --- a/harbour/contrib/hbnf/menu1.prg +++ b/harbour/contrib/hbnf/menu1.prg @@ -353,7 +353,7 @@ FUNCTION FT_MENU1( aBar, aOptions, aColors, nTopRow, lShadow ) // this is the routine that calculates the position of each item // on the menu bar. - + aBarCol[1] := 0 nTtlUsed := LEN( aBar[1] ) + 1 AEVAL( aBar, ; diff --git a/harbour/contrib/hbnf/menutonf.prg b/harbour/contrib/hbnf/menutonf.prg index c095620c90..fa4d2cee18 100644 --- a/harbour/contrib/hbnf/menutonf.prg +++ b/harbour/contrib/hbnf/menutonf.prg @@ -590,5 +590,3 @@ set( _SET_CURSOR, nCursor ) eval( bGetSet, nActive ) return nActive - - diff --git a/harbour/contrib/hbnf/metaph.prg b/harbour/contrib/hbnf/metaph.prg index c138533957..476118e6e2 100644 --- a/harbour/contrib/hbnf/metaph.prg +++ b/harbour/contrib/hbnf/metaph.prg @@ -390,4 +390,3 @@ RETURN cConverted *------------------------------------------------ // eof metaph.prg - diff --git a/harbour/contrib/hbnf/month.prg b/harbour/contrib/hbnf/month.prg index 0a72c7036b..232968d520 100644 --- a/harbour/contrib/hbnf/month.prg +++ b/harbour/contrib/hbnf/month.prg @@ -113,4 +113,3 @@ LOCAL lIsMonth, nTemp, aRetVal aRetVal[3] := FT_MADD( aRetVal[2], 1 ) - 1 RETURN aRetVal - diff --git a/harbour/contrib/hbnf/mouse.c b/harbour/contrib/hbnf/mouse.c index 1ab7aab765..ea0bd73524 100644 --- a/harbour/contrib/hbnf/mouse.c +++ b/harbour/contrib/hbnf/mouse.c @@ -52,7 +52,7 @@ */ #include "hbapi.h" -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) #include "dos.h" #endif #include "hbapiitm.h" @@ -61,7 +61,7 @@ HB_FUNC( _MGET_PAGE ) { int iPage; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1E; @@ -78,7 +78,7 @@ HB_FUNC( _MGET_PAGE ) HB_FUNC( _MSET_PAGE ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1D; @@ -95,7 +95,7 @@ HB_FUNC( _MGET_MVERSION ) int iIRQ; int iMajor; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; @@ -144,7 +144,7 @@ HB_FUNC( _MGET_HORISPEED ) { int iSpeed; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1B; @@ -162,7 +162,7 @@ HB_FUNC( _MGET_HORISPEED ) HB_FUNC( _MGET_VERSPEED ) { int iSpeed; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1B; @@ -180,7 +180,7 @@ HB_FUNC( _MGET_VERSPEED ) HB_FUNC( _MGET_DOUBLESPEED ) { int iSpeed; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1B; @@ -197,7 +197,7 @@ HB_FUNC( _MGET_DOUBLESPEED ) HB_FUNC( _MSET_SENSITIVE ) /* nHoriz,nVert,nDouble) */ { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1A; @@ -211,7 +211,7 @@ HB_FUNC( _MSET_SENSITIVE ) /* nHoriz,nVert,nDouble) */ HB_FUNC( _MSE_CONOFF ) /* nTop*8,nLeft*8,nBotton*8,nRight*8) */ { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x1A; @@ -228,7 +228,7 @@ HB_FUNC( _MGET_MICS ) { int iHori; int iVert; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x0B; @@ -262,7 +262,7 @@ HB_FUNC( _MGET_MICS ) HB_FUNC( _M_RESET ) { int iMouse; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0; @@ -281,7 +281,7 @@ HB_FUNC( _M_RESET ) HB_FUNC( _MSE_SHOWCURS ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 1; @@ -292,7 +292,7 @@ HB_FUNC( _MSE_SHOWCURS ) HB_FUNC( _MSE_MHIDECRS ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 2; @@ -305,7 +305,7 @@ HB_FUNC( _MSE_GETPOS ) { int iHori; int iVert; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 3; @@ -338,7 +338,7 @@ HB_FUNC( _MSE_GETPOS ) HB_FUNC( _M_GETX ) { int iRow; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 3; @@ -356,7 +356,7 @@ HB_FUNC( _M_GETX ) HB_FUNC( _M_GETY ) { int iCol; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 3; @@ -373,7 +373,7 @@ HB_FUNC( _M_GETY ) HB_FUNC( _M_MSETPOS ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 4; @@ -386,7 +386,7 @@ HB_FUNC( _M_MSETPOS ) HB_FUNC( _M_MSETCOORD ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 4; @@ -399,7 +399,7 @@ HB_FUNC( _M_MSETCOORD ) HB_FUNC( _M_MXLIMIT ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; int iMaxRow = hb_parni( 2 ); @@ -417,7 +417,7 @@ HB_FUNC( _M_MXLIMIT ) HB_FUNC( _M_MYLIMIT ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; int iMaxCol = hb_parni( 2 ); @@ -437,7 +437,7 @@ HB_FUNC( _M_MBUTPRS ) int inY; int inButton; BOOL lStatus; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 6; @@ -481,7 +481,7 @@ HB_FUNC( _M_MBUTPRS ) HB_FUNC( _M_MBUTREL ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) union REGS regs; regs.HB_XREGS.ax = 0x0A; regs.HB_XREGS.bx = hb_parni( 1 ); @@ -504,7 +504,7 @@ HB_FUNC( _M_MBUTREL ) HB_FUNC( _M_MDEFCRS ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 0x0A; @@ -523,7 +523,7 @@ HB_FUNC( _M_MGETCOORD ) int inY; int inButton; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; regs.HB_XREGS.ax = 3; diff --git a/harbour/contrib/hbnf/mouse1.prg b/harbour/contrib/hbnf/mouse1.prg index e13be49571..6f78175cb6 100644 --- a/harbour/contrib/hbnf/mouse1.prg +++ b/harbour/contrib/hbnf/mouse1.prg @@ -32,7 +32,7 @@ static s_lMinit:=.F. nCol := VAL(nCol) ENDIF - if !FT_MINIT() + if !FT_MINIT() @ maxrow(), 0 say "Mouse driver is not installed!" return "" @@ -592,7 +592,7 @@ aReg[AX]:=27 FT_INT86( 51, aReg ) // execute mouse interrupt -*/ +*/ // Set the return values nHoriz := _mget_horispeed() @@ -1281,7 +1281,7 @@ local aReg:={} nButPrs := aReg[1] // store updated press count nX := aReg[2] // x-coordinate at last press nY := aReg[3] // y-coordinate at last press - + _m_MBUTPRS(nButton) RETURN aReg[4] // return button status @@ -1407,7 +1407,7 @@ FUNCTION FT_MDEFCRS( nCurType, nScrMask, nCurMask ) // define text cursor type aReg[DX] := nCurMask // load cursor mask value FT_INT86( 51, aReg ) // execute mouse interrupt */ -_m_mdefcrs(nCurType, nScrMask, nCurMask ) +_m_mdefcrs(nCurType, nScrMask, nCurMask ) RETURN NIL // no function output @@ -1467,6 +1467,5 @@ local iButton nX := INT(aReg[1]/8) // store new x-coordinate nY := INT(aReg[2]/8) // store new y-coordinate iButton:= aReg[3] // return button status - -RETURN iButton +RETURN iButton diff --git a/harbour/contrib/hbnf/mouse2.prg b/harbour/contrib/hbnf/mouse2.prg index ba5d78e1c9..15eb841956 100644 --- a/harbour/contrib/hbnf/mouse2.prg +++ b/harbour/contrib/hbnf/mouse2.prg @@ -1005,4 +1005,3 @@ FUNCTION FT_MDEFCRS( nCurType, nScrMask, nCurMask ) // define text cursor type RETURN NIL // no function output */ - diff --git a/harbour/contrib/hbnf/nwlstat.prg b/harbour/contrib/hbnf/nwlstat.prg index 645956de9e..36d3e5a03a 100644 --- a/harbour/contrib/hbnf/nwlstat.prg +++ b/harbour/contrib/hbnf/nwlstat.prg @@ -81,4 +81,3 @@ FUNCTION FT_NWLSTAT() endif RETURN nStation - diff --git a/harbour/contrib/hbnf/nwuid.prg b/harbour/contrib/hbnf/nwuid.prg index 60899fd9c6..8b94cfdab2 100644 --- a/harbour/contrib/hbnf/nwuid.prg +++ b/harbour/contrib/hbnf/nwuid.prg @@ -125,6 +125,3 @@ FUNCTION FT_NWUID( nConn ) FT_INT86( DOS, aRegs ) RETURN alltrim( strtran( substr( aRegs[ ES ], 9, 48 ), chr(0) ) ) - - - diff --git a/harbour/contrib/hbnf/page.prg b/harbour/contrib/hbnf/page.prg index 4b9c1ea04a..c270d79beb 100644 --- a/harbour/contrib/hbnf/page.prg +++ b/harbour/contrib/hbnf/page.prg @@ -111,5 +111,3 @@ FUNCTION FT_GETVPG() RETURN ( HIGHBYTE( aRegs[ BX ] ) ) */ Return _ft_getvpg() - - diff --git a/harbour/contrib/hbnf/prtscr.c b/harbour/contrib/hbnf/prtscr.c index 050e4e129b..538e1716d5 100644 --- a/harbour/contrib/hbnf/prtscr.c +++ b/harbour/contrib/hbnf/prtscr.c @@ -63,9 +63,9 @@ HB_FUNC( FT_PRTSCR ) { -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) if ( hb_pcount() && HB_ISLOG( 1 ) ) - { + { if ( hb_parl( 1 ) ) pbyte = 0; else diff --git a/harbour/contrib/hbnf/putkey.c b/harbour/contrib/hbnf/putkey.c index 6c76a3e3a8..067afe5cae 100644 --- a/harbour/contrib/hbnf/putkey.c +++ b/harbour/contrib/hbnf/putkey.c @@ -2,7 +2,7 @@ * $Id$ */ -/* +/* * File......: putkey.asm * Author....: Ted Means * CIS ID....: 73067,3332 diff --git a/harbour/contrib/hbnf/pvid.prg b/harbour/contrib/hbnf/pvid.prg index 09caf175f5..cacf28abd6 100644 --- a/harbour/contrib/hbnf/pvid.prg +++ b/harbour/contrib/hbnf/pvid.prg @@ -128,5 +128,3 @@ if nNewSize >= 0 endif return len( aVideo ) - - diff --git a/harbour/contrib/hbnf/rmdir.c b/harbour/contrib/hbnf/rmdir.c index 68d592ff2a..38c4336302 100644 --- a/harbour/contrib/hbnf/rmdir.c +++ b/harbour/contrib/hbnf/rmdir.c @@ -2,7 +2,7 @@ * $Id$ */ -/* +/* * File......: rmdir.asm * Author....: Ted Means * CIS ID....: 73067,3332 diff --git a/harbour/contrib/hbnf/scancode.prg b/harbour/contrib/hbnf/scancode.prg index cdf9ace57b..e83aec5d94 100644 --- a/harbour/contrib/hbnf/scancode.prg +++ b/harbour/contrib/hbnf/scancode.prg @@ -105,4 +105,3 @@ FUNCTION FT_SCANCODE() aRegs[ AX ] = MAKEHI( 0 ) FT_INT86( KEYB, aRegs ) RETURN ( chr(LOWBYTE( aRegs[AX] )) + chr(HIGHBYTE( aRegs[AX] )) ) - diff --git a/harbour/contrib/hbnf/setdate.prg b/harbour/contrib/hbnf/setdate.prg index 95179baedd..82587545d2 100644 --- a/harbour/contrib/hbnf/setdate.prg +++ b/harbour/contrib/hbnf/setdate.prg @@ -98,4 +98,3 @@ function FT_SETDATE( dDate ) aregs[ DX ] = ( month( dDate ) * ( 2 ^ 8 ) ) + day( dDate ) return( FT_INT86( DOS, aRegs ) ) - diff --git a/harbour/contrib/hbnf/setkeys.c b/harbour/contrib/hbnf/setkeys.c index be0052ba5e..adf705c1d3 100644 --- a/harbour/contrib/hbnf/setkeys.c +++ b/harbour/contrib/hbnf/setkeys.c @@ -50,7 +50,7 @@ * */ -/* +/* * File......: setlastk.asm * Author....: Ted Means * CIS ID....: 73067,3332 diff --git a/harbour/contrib/hbnf/setlastk.c b/harbour/contrib/hbnf/setlastk.c index c0e2b7590e..a68866b7cf 100644 --- a/harbour/contrib/hbnf/setlastk.c +++ b/harbour/contrib/hbnf/setlastk.c @@ -50,7 +50,7 @@ * */ -/* +/* * File......: setlastk.asm * Author....: Ted Means * CIS ID....: 73067,3332 diff --git a/harbour/contrib/hbnf/settime.prg b/harbour/contrib/hbnf/settime.prg index 2e2fb016af..f097e93354 100644 --- a/harbour/contrib/hbnf/settime.prg +++ b/harbour/contrib/hbnf/settime.prg @@ -99,4 +99,3 @@ function FT_SETTIME( cTime ) aRegs[ DX ] = SECS( cTime ) * ( 2 ^ 8 ) return( FT_INT86( DOS, aRegs ) ) - diff --git a/harbour/contrib/hbnf/sysmem.prg b/harbour/contrib/hbnf/sysmem.prg index 369c43959e..fe9c74547a 100644 --- a/harbour/contrib/hbnf/sysmem.prg +++ b/harbour/contrib/hbnf/sysmem.prg @@ -74,4 +74,3 @@ FUNCTION FT_SYSMEM() FT_INT86( MEMSIZE, aRegs ) RETURN ( aRegs[ AX ] ) - diff --git a/harbour/contrib/hbnf/tempfile.prg b/harbour/contrib/hbnf/tempfile.prg index acfbd61030..fd4503d7a0 100644 --- a/harbour/contrib/hbnf/tempfile.prg +++ b/harbour/contrib/hbnf/tempfile.prg @@ -177,4 +177,3 @@ endif RETURN nil #endif - diff --git a/harbour/contrib/hbnf/vidcur.prg b/harbour/contrib/hbnf/vidcur.prg index 9dfab91152..786b8ad115 100644 --- a/harbour/contrib/hbnf/vidcur.prg +++ b/harbour/contrib/hbnf/vidcur.prg @@ -138,4 +138,3 @@ FUNCTION FT_GETVCUR( nPage ) FT_INT86( VIDEO, aRegs ) RETURN ( { HIGHBYTE( aRegs[CX] ), LOWBYTE( aRegs[CX] ), HIGHBYTE( aRegs[DX] ), LOWBYTE( aRegs[DX] ) } ) - diff --git a/harbour/contrib/hbnf/vidmode.prg b/harbour/contrib/hbnf/vidmode.prg index ecac36bb74..229b96e09d 100644 --- a/harbour/contrib/hbnf/vidmode.prg +++ b/harbour/contrib/hbnf/vidmode.prg @@ -127,5 +127,4 @@ FUNCTION FT_GETMODE() RETURN ( LOWBYTE( aRegs[ AX ] ) ) */ - RETURN _ft_getmode() - + RETURN _ft_getmode() diff --git a/harbour/contrib/hbnf/wda.prg b/harbour/contrib/hbnf/wda.prg index 836594c7bb..b2676c3e48 100644 --- a/harbour/contrib/hbnf/wda.prg +++ b/harbour/contrib/hbnf/wda.prg @@ -81,5 +81,3 @@ FUNCTION ft_addWkDy( dStart, nDys ) (nDys+nDc-2) % 5 + 7 * int( (nDys+nDc-2) / 5 ) + 2 - nDc ; ) ; ) - - diff --git a/harbour/contrib/hbnf/year.prg b/harbour/contrib/hbnf/year.prg index a79d2e3a51..5ce05f72de 100644 --- a/harbour/contrib/hbnf/year.prg +++ b/harbour/contrib/hbnf/year.prg @@ -95,4 +95,3 @@ FUNCTION FT_YEAR(dGivenDate) SET(_SET_DATEFORMAT, cDateFormat) RETURN aRetVal - diff --git a/harbour/contrib/hbodbc/odbcold.c b/harbour/contrib/hbodbc/odbcold.c index cf2b256e0b..9d0fe4d2a0 100644 --- a/harbour/contrib/hbodbc/odbcold.c +++ b/harbour/contrib/hbodbc/odbcold.c @@ -52,7 +52,7 @@ #include "hbapi.h" -#if !defined(HB_ODBC_LEGACY_LEVEL_OFF) +#if !defined( HB_ODBC_LEGACY_LEVEL_OFF ) HB_FUNC_EXTERN( SQLALLOCENV ) ; HB_FUNC( SQLALLOCEN ) { HB_FUNC_EXEC( SQLALLOCENV ); } HB_FUNC_EXTERN( SQLALLOCCONNECT ) ; HB_FUNC( SQLALLOCCO ) { HB_FUNC_EXEC( SQLALLOCCONNECT ); } diff --git a/harbour/contrib/hbtpathy/telepath.ch b/harbour/contrib/hbtpathy/telepath.ch index cd1b27bfb0..14c57a561d 100644 --- a/harbour/contrib/hbtpathy/telepath.ch +++ b/harbour/contrib/hbtpathy/telepath.ch @@ -111,7 +111,7 @@ #define TXS_WEND 9 // Waiting for end of file #define TXS_EFILE 10 // End of file #define TXS_END 11 // End of transfer - + #define TP_32MAGIC 558161692 // Handshaking flags for tp_hshk() diff --git a/harbour/contrib/hbvpdf/hbvpdf.ch b/harbour/contrib/hbvpdf/hbvpdf.ch index fd85fa9d75..75194ebe10 100644 --- a/harbour/contrib/hbvpdf/hbvpdf.ch +++ b/harbour/contrib/hbvpdf/hbvpdf.ch @@ -226,4 +226,3 @@ #define pdf_WHITESMOKE "F5F5F5" #define pdf_YELLOW "FFFF00" #define pdf_YELLOWGREEN "9ACD32" - diff --git a/harbour/contrib/hbwin/axfunc.prg b/harbour/contrib/hbwin/axfunc.prg index a3ac8b1ca4..8ec4f7c912 100644 --- a/harbour/contrib/hbwin/axfunc.prg +++ b/harbour/contrib/hbwin/axfunc.prg @@ -57,4 +57,4 @@ LOCAL oAx := WIN_OleAuto() IF bHandler != NIL oAx:__hSink := __AxRegisterHandler( oAx:__hObj, bHandler ) ENDIF -RETURN oAx +RETURN oAx diff --git a/harbour/contrib/hbwin/hbwinole.h b/harbour/contrib/hbwin/hbwinole.h index c938c93160..2ee9690f46 100644 --- a/harbour/contrib/hbwin/hbwinole.h +++ b/harbour/contrib/hbwin/hbwinole.h @@ -85,7 +85,7 @@ ( defined( __BORLANDC__ ) || \ defined( _MSC_VER ) || \ defined( __MINGW32__ ) || \ - ( defined(__WATCOMC__) && ( __WATCOMC__ >= 1270 ) ) ) + ( defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1270 ) ) ) # define HB_ID_REF( id ) ( id ) # define HB_VTBL( pSelf ) ( pSelf ) # define HB_THIS( pSelf ) diff --git a/harbour/contrib/hbwin/wapi_commctrl.c b/harbour/contrib/hbwin/wapi_commctrl.c index 4567b7c945..8a626508e5 100644 --- a/harbour/contrib/hbwin/wapi_commctrl.c +++ b/harbour/contrib/hbwin/wapi_commctrl.c @@ -56,7 +56,7 @@ #include "hbwapi.h" #include -#if defined(__BORLANDC__) && !defined(HB_ARCH_64BIT) +#if defined( __BORLANDC__ ) && !defined( HB_ARCH_64BIT ) #undef MAKELONG #define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | \ (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) @@ -659,7 +659,7 @@ HB_FUNC( WAPI_TABCTRL_SETPADDING ) HB_FUNC( WAPI_TABCTRL_GETTOOLTIPS ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_NINT( ( HB_PTRDIFF ) TabCtrl_GetToolTips( wapi_par_HWND( 1 ) ) ); #else wapi_ret_NINT( -1 ); @@ -671,7 +671,7 @@ HB_FUNC( WAPI_TABCTRL_GETTOOLTIPS ) HB_FUNC( WAPI_TABCTRL_SETTOOLTIPS ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) TabCtrl_SetToolTips( wapi_par_HWND( 1 ), wapi_par_HWND( 2 ) ); #endif } @@ -742,7 +742,7 @@ HB_FUNC( WAPI_TABCTRL_GETEXTENDEDSTYLE ) HB_FUNC( WAPI_TABCTRL_SETUNICODEFORMAT ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_L( TabCtrl_SetUnicodeFormat( wapi_par_HWND( 1 ), wapi_par_BOOL( 2 ) ) ); #else wapi_ret_L( FALSE ); @@ -754,7 +754,7 @@ HB_FUNC( WAPI_TABCTRL_SETUNICODEFORMAT ) HB_FUNC( WAPI_TABCTRL_GETUNICODEFORMAT ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_L( TabCtrl_GetUnicodeFormat( wapi_par_HWND( 1 ) ) ); #else wapi_ret_L( FALSE ); diff --git a/harbour/contrib/hbwin/wapi_winbase.c b/harbour/contrib/hbwin/wapi_winbase.c index 7a44ae8002..e50c8cb6c4 100644 --- a/harbour/contrib/hbwin/wapi_winbase.c +++ b/harbour/contrib/hbwin/wapi_winbase.c @@ -90,7 +90,7 @@ HB_FUNC( WAPI_GETCURRENTTHREAD ) HB_FUNC( WAPI_SETPROCESSWORKINGSETSIZE ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_L( SetProcessWorkingSetSize( wapi_par_HANDLE( 1 ) /* hProcess */, ( SIZE_T ) hb_parnint( 2 ) /* dwMinimumWorkingSetSize */, @@ -127,7 +127,7 @@ HB_FUNC( WAPI_FREELIBRARY ) HB_FUNC( WAPI_GETPROCADDRESS ) { -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) hb_retptr( NULL ); #else hb_retptr( ( void * ) GetProcAddress( ( HMODULE ) hb_parptr( 1 ), HB_ISCHAR( 2 ) ? ( LPCSTR ) hb_parc( 2 ) : ( LPCSTR ) ( HB_PTRDIFF ) hb_parnint( 2 ) ) ); diff --git a/harbour/contrib/hbwin/wapi_winuser.c b/harbour/contrib/hbwin/wapi_winuser.c index 4ef9deb02f..1ab3e0ef8d 100644 --- a/harbour/contrib/hbwin/wapi_winuser.c +++ b/harbour/contrib/hbwin/wapi_winuser.c @@ -104,7 +104,7 @@ BOOL EnableScrollBar( HWND hWnd, UINT wSBflags, UINT wArrows ); */ HB_FUNC( WAPI_ENABLESCROLLBAR ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_L( EnableScrollBar( wapi_par_HWND( 1 ), wapi_par_UINT( 2 ), wapi_par_UINT( 3 ) ) ); @@ -167,7 +167,7 @@ int GetScrollPos( HWND hWnd, int nBar ); */ HB_FUNC( WAPI_GETSCROLLPOS ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_NI( GetScrollPos( wapi_par_HWND( 1 ), wapi_par_INT( 2 ) ) ); #else @@ -180,7 +180,7 @@ BOOL GetScrollRange( HWND hWnd, int nBar, LPINT lpMinPos, LPINT lpMaxPos ); */ HB_FUNC( WAPI_GETSCROLLRANGE ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) { int minPos, maxPos; @@ -271,7 +271,7 @@ BOOL ShowScrollBar( HWND hWnd, int wBar, BOOL bShow ); */ HB_FUNC( WAPI_SHOWSCROLLBAR ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) wapi_ret_L( ShowScrollBar( wapi_par_HWND( 1 ), wapi_par_INT( 2 ), wapi_par_BOOL( 3 ) ) ); diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c index 71e95f8252..73ce71d791 100644 --- a/harbour/contrib/hbwin/win_dll.c +++ b/harbour/contrib/hbwin/win_dll.c @@ -64,7 +64,7 @@ #include "hbapierr.h" #include "hbapiitm.h" -#if !defined( HB_NO_ASM ) && defined( HB_OS_WIN ) && !defined(__CYGWIN__) +#if !defined( HB_NO_ASM ) && defined( HB_OS_WIN ) && !defined( __CYGWIN__ ) #ifdef __XHARBOUR__ @@ -241,7 +241,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, /* Call the specified function with the given parameters. Build a proper stack and take care of correct return value processing. */ RESULT Res = { 0 }; -#if defined(HB_OS_WIN_CE) || defined(HB_OS_WIN_64) +#if defined( HB_OS_WIN_CE ) || defined( HB_OS_WIN_64 ) HB_SYMBOL_UNUSED( iFlags ); HB_SYMBOL_UNUSED( lpFunction ); HB_SYMBOL_UNUSED( nArgs ); @@ -254,7 +254,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, BYTE * pArg; #if defined( __MINGW32__ ) - #elif defined( __BORLANDC__ ) || defined(__DMC__) + #elif defined( __BORLANDC__ ) || defined( __DMC__ ) #else DWORD * pESP; #endif @@ -264,7 +264,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, asm volatile( "\tmovl %%esp, %0\n" "\tsubl $0x100, %%esp\n" : "=r" (pStack) ); - #elif defined( __BORLANDC__ ) || defined(__DMC__) + #elif defined( __BORLANDC__ ) || defined( __DMC__ ) pStack = ( DWORD * ) _ESP; _ESP -= 0x100; #else @@ -350,7 +350,7 @@ RESULT DynaCall( int iFlags, LPVOID lpFunction, int nArgs, ( ( int * ) pRet )[ 0 ] = dwEAX; ( ( int * ) pRet )[ 1 ] = dwEDX; } - #elif defined( __BORLANDC__ ) || defined(__DMC__) + #elif defined( __BORLANDC__ ) || defined( __DMC__ ) _ESP += ( 0x100 - dwStSize ); _EDX = ( DWORD ) &lpFunction; __emit__( 0xFF, 0x12 ); /* call [edx]; */ @@ -705,7 +705,7 @@ static void DllExec( int iFlags, int iRtype, LPVOID lpFunction, PXPP_DLLEXEC xec /* ------------------------------------------------------------------ */ -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) static HB_GARBAGE_FUNC( _DLLUnload ) { PXPP_DLLEXEC xec = ( PXPP_DLLEXEC ) Cargo; @@ -730,7 +730,7 @@ static HB_GARBAGE_FUNC( _DLLUnload ) static LPVOID hb_getprocaddress( HMODULE hDLL, int iProc ) { -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) HB_SYMBOL_UNUSED( hDLL ); HB_SYMBOL_UNUSED( iProc ); return NULL; @@ -810,7 +810,7 @@ HB_FUNC( DLLCALL ) HB_FUNC( DLLPREPARECALL ) { -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) PXPP_DLLEXEC xec = ( PXPP_DLLEXEC ) hb_gcAlloc( sizeof( XPP_DLLEXEC ), _DLLUnload ); char * pszErrorText; diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c index 5a2aaf59fb..fc8b3410c7 100644 --- a/harbour/contrib/hbwin/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -75,7 +75,7 @@ #include "hbapi.h" #include "hbapiitm.h" -#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) #include diff --git a/harbour/contrib/hbwin/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c index 98221e0f04..0cd0c5e50f 100644 --- a/harbour/contrib/hbwin/win_prn2.c +++ b/harbour/contrib/hbwin/win_prn2.c @@ -52,12 +52,12 @@ #include "hbsetup.h" -#if defined(HB_OS_WIN) && \ - !( defined(__RSXNT__) || defined(__CYGWIN__) || defined(HB_OS_WIN_CE) ) +#if defined( HB_OS_WIN ) && \ + !( defined( __RSXNT__ ) || defined( __CYGWIN__ ) || defined( HB_OS_WIN_CE ) ) #include -#if defined(__LCC__) +#if defined( __LCC__ ) # include #endif diff --git a/harbour/contrib/hbxbp/appevent.ch b/harbour/contrib/hbxbp/appevent.ch index b8ccd540b0..22326e5887 100644 --- a/harbour/contrib/hbxbp/appevent.ch +++ b/harbour/contrib/hbxbp/appevent.ch @@ -368,5 +368,3 @@ #endif /*----------------------------------------------------------------------*/ - - diff --git a/harbour/contrib/hbxbp/gra.ch b/harbour/contrib/hbxbp/gra.ch index a9b5ddf0f2..1f6e3d6a73 100644 --- a/harbour/contrib/hbxbp/gra.ch +++ b/harbour/contrib/hbxbp/gra.ch @@ -31,10 +31,3 @@ #define _GRA_CH #endif - - - - - - - diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch index 07b9f135bc..df6fa9123f 100644 --- a/harbour/contrib/hbxbp/xbp.ch +++ b/harbour/contrib/hbxbp/xbp.ch @@ -283,4 +283,3 @@ /*----------------------------------------------------------------------*/ #define _XBP_CH #endif - diff --git a/harbour/contrib/hbxbp/xbpfiledialog.prg b/harbour/contrib/hbxbp/xbpfiledialog.prg index 95f9e57bd1..f8b76b433a 100644 --- a/harbour/contrib/hbxbp/xbpfiledialog.prg +++ b/harbour/contrib/hbxbp/xbpfiledialog.prg @@ -299,4 +299,3 @@ METHOD XbpFileDialog:setStyle() RETURN self /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg index 812b67ee7b..e5066a6654 100644 --- a/harbour/contrib/hbxbp/xbpgeneric.prg +++ b/harbour/contrib/hbxbp/xbpgeneric.prg @@ -333,4 +333,3 @@ FUNCTION RemoveEventLoop( oEventLoop ) RETURN nil /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbxbp/xbphtmlviewer.prg b/harbour/contrib/hbxbp/xbphtmlviewer.prg index 036aec32b9..7b57dcaa3e 100644 --- a/harbour/contrib/hbxbp/xbphtmlviewer.prg +++ b/harbour/contrib/hbxbp/xbphtmlviewer.prg @@ -264,4 +264,3 @@ METHOD XbpHTMLViewer:navigate( cURL ) #endif /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbxbp/xbptoolbar.prg b/harbour/contrib/hbxbp/xbptoolbar.prg index f8505cc184..abb4749b72 100644 --- a/harbour/contrib/hbxbp/xbptoolbar.prg +++ b/harbour/contrib/hbxbp/xbptoolbar.prg @@ -435,4 +435,3 @@ METHOD XbpToolbarButton:new( cCaption, nStyle, cKey ) RETURN Self /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg index 20d8225492..f8ed4748ef 100644 --- a/harbour/contrib/hbxbp/xbpwindow.prg +++ b/harbour/contrib/hbxbp/xbpwindow.prg @@ -1813,4 +1813,3 @@ STATIC FUNCTION Xbp_SetPresParam( aPP, nParam, xValue ) RETURN oldValue /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 89031f8630..51d5754d3a 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -2097,7 +2097,7 @@ static HB_ERRCODE adsGetValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) hb_itemPutNLLen( pItem, ( LONG ) lVal, 11 ); break; } -#if ADS_LIB_VERSION >= 700 && !defined(HB_LONG_LONG_OFF) +#if ADS_LIB_VERSION >= 700 && !defined( HB_LONG_LONG_OFF ) case HB_FT_AUTOINC: { SIGNED64 qVal = 0; diff --git a/harbour/contrib/rddads/rddads.h b/harbour/contrib/rddads/rddads.h index 5b8854616f..2b86df5f8a 100644 --- a/harbour/contrib/rddads/rddads.h +++ b/harbour/contrib/rddads/rddads.h @@ -68,21 +68,21 @@ #include "ace.h" /* Autodetect ACE version. */ -#if defined(DANISH_ADS_CS_AS_1252) +#if defined( DANISH_ADS_CS_AS_1252 ) #define _ADS_LIB_VERSION 910 /* or upper */ -#elif defined(ADS_NOTIFICATION_CONNECTION) +#elif defined( ADS_NOTIFICATION_CONNECTION ) #define _ADS_LIB_VERSION 900 -#elif defined(ADS_UDP_IP_CONNECTION) +#elif defined( ADS_UDP_IP_CONNECTION ) #define _ADS_LIB_VERSION 810 -#elif defined(ADS_REPLICATION_CONNECTION) +#elif defined( ADS_REPLICATION_CONNECTION ) #define _ADS_LIB_VERSION 800 -#elif defined(ADS_NOT_AUTO_OPEN) +#elif defined( ADS_NOT_AUTO_OPEN ) #define _ADS_LIB_VERSION 710 -#elif defined(ADS_FTS_INDEX_ORDER) +#elif defined( ADS_FTS_INDEX_ORDER ) #define _ADS_LIB_VERSION 700 -#elif defined(ADS_COMPRESS_ALWAYS) +#elif defined( ADS_COMPRESS_ALWAYS ) #define _ADS_LIB_VERSION 620 -#elif defined(ADS_USER_DEFINED) +#elif defined( ADS_USER_DEFINED ) #define _ADS_LIB_VERSION 611 #else #define _ADS_LIB_VERSION 500 diff --git a/harbour/contrib/xhb/arrayblk.prg b/harbour/contrib/xhb/arrayblk.prg index 9d2a6cad7e..9eaff056c1 100644 --- a/harbour/contrib/xhb/arrayblk.prg +++ b/harbour/contrib/xhb/arrayblk.prg @@ -54,4 +54,3 @@ FUNCTION HB_ARRAYBLOCK( aArray, nIndex ) RETURN {| x | iif( PCount() == 0, aArray[ nIndex ], aArray[ nIndex ] := x )} - diff --git a/harbour/contrib/xhb/bkgtsks.c b/harbour/contrib/xhb/bkgtsks.c index b67b718e1f..c8d624dec3 100644 --- a/harbour/contrib/xhb/bkgtsks.c +++ b/harbour/contrib/xhb/bkgtsks.c @@ -68,8 +68,8 @@ #include "hbdate.h" #include "error.ch" -#if defined(HB_OS_UNIX) -#if defined(HB_OS_DARWIN) +#if defined( HB_OS_UNIX ) +#if defined( HB_OS_DARWIN ) #include /* We need usleep() in Darwin */ #else #include diff --git a/harbour/contrib/xhb/classex.ch b/harbour/contrib/xhb/classex.ch index ad9a02b822..8866f52416 100644 --- a/harbour/contrib/xhb/classex.ch +++ b/harbour/contrib/xhb/classex.ch @@ -182,4 +182,3 @@ DATA __FNAME() [AS ] EXPORTED [INIT ] #xtranslate __FNAME() => F - diff --git a/harbour/contrib/xhb/filestat.c b/harbour/contrib/xhb/filestat.c index e4d8101f87..384c2c6cdf 100644 --- a/harbour/contrib/xhb/filestat.c +++ b/harbour/contrib/xhb/filestat.c @@ -65,7 +65,7 @@ #include #include #elif defined( HB_OS_WIN ) - #if ( defined(__BORLANDC__) || defined(_MSC_VER) || defined(__LCC__) || defined( __DMC__ )) && ! defined( INVALID_FILE_ATTRIBUTES ) + #if ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || defined( __LCC__ ) || defined( __DMC__ ) ) && ! defined( INVALID_FILE_ATTRIBUTES ) #define INVALID_FILE_ATTRIBUTES ((DWORD)(-1)) #endif #endif diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index a1d3687452..055ca54585 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -57,10 +57,10 @@ #ifdef __XHARBOUR__ - #if defined(__PLATFORM__Windows) .AND. !defined(__PLATFORM__WINDOWS) + #if defined( __PLATFORM__Windows ) .AND. !defined( __PLATFORM__WINDOWS ) #define __PLATFORM__WINDOWS #endif - #if defined(__PLATFORM__Linux) .AND. !defined(__PLATFORM__LINUX) + #if defined( __PLATFORM__Linux ) .AND. !defined( __PLATFORM__LINUX ) #define __PLATFORM__LINUX #endif @@ -223,10 +223,10 @@ #else - #if defined(__PLATFORM__WINDOWS) .AND. !defined(__PLATFORM__Windows) + #if defined( __PLATFORM__WINDOWS ) .AND. !defined( __PLATFORM__Windows ) #define __PLATFORM__Windows #endif - #if defined(__PLATFORM__LINUX) .AND. !defined(__PLATFORM__Linux) + #if defined( __PLATFORM__LINUX ) .AND. !defined( __PLATFORM__Linux ) #define __PLATFORM__Linux #endif diff --git a/harbour/contrib/xhb/hbcomprs.c b/harbour/contrib/xhb/hbcomprs.c index 5d84b91f50..30d03b7494 100644 --- a/harbour/contrib/xhb/hbcomprs.c +++ b/harbour/contrib/xhb/hbcomprs.c @@ -108,14 +108,14 @@ HB_FUNC( HB_COMPRESS ) return; } - cSource = hb_itemGetCPtr( pSource ); + cSource = hb_itemGetCPtr( pSource ); if (hb_pcount() > iFirst + 1 ) { ulSrclen = (ULONG) hb_parnl( iFirst + 2 ); } else { - ulSrclen = hb_itemGetCLen( pSource ); + ulSrclen = hb_itemGetCLen( pSource ); } /* Allocation mode: user provided or allocated here */ @@ -193,7 +193,7 @@ HB_FUNC( HB_UNCOMPRESS ) return; } - cSource = hb_itemGetCPtr( pSource ); + cSource = hb_itemGetCPtr( pSource ); ulDstlen = (ULONG) hb_parnl( 1 ); if (hb_pcount() > 2 ) { @@ -201,7 +201,7 @@ HB_FUNC( HB_UNCOMPRESS ) } else { - ulSrclen = hb_itemGetCLen( pSource ); + ulSrclen = hb_itemGetCLen( pSource ); } /* Allocation mode: user provided or allocated here */ @@ -278,4 +278,3 @@ HB_FUNC( HB_COMPRESSBUFLEN ) { hb_retnl( (LONG) hb_destBuflen( hb_parni(1) ) ); } - diff --git a/harbour/contrib/xhb/hbctypes.ch b/harbour/contrib/xhb/hbctypes.ch index c31351efed..808aefc531 100644 --- a/harbour/contrib/xhb/hbctypes.ch +++ b/harbour/contrib/xhb/hbctypes.ch @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * www - http://www.harbour-project.org * diff --git a/harbour/contrib/xhb/hblog.ch b/harbour/contrib/xhb/hblog.ch index 237f8a7f38..9621bee260 100644 --- a/harbour/contrib/xhb/hblog.ch +++ b/harbour/contrib/xhb/hblog.ch @@ -114,4 +114,3 @@ #xtranslate PRIO[RITY] DEBUG => PRIO HB_LOG_DEBUG #endif /* HB_LOGDEF_CH */ - diff --git a/harbour/contrib/xhb/hblogdef.ch b/harbour/contrib/xhb/hblogdef.ch index 0bd24592b3..581a14a514 100644 --- a/harbour/contrib/xhb/hblogdef.ch +++ b/harbour/contrib/xhb/hblogdef.ch @@ -51,7 +51,7 @@ * */ -#ifndef HB_LOGDEF_CH +#ifndef HB_LOGDEF_CH #define HB_LOGDEF_CH #define HB_LOG_DEFAULT -1 @@ -63,4 +63,3 @@ #define HB_LOG_DEBUG 5 #endif /* HB_LOGDEF_CH */ - diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c index 52e4fad533..8dd0284f1d 100644 --- a/harbour/contrib/xhb/hbserv.c +++ b/harbour/contrib/xhb/hbserv.c @@ -66,10 +66,10 @@ /* These targets can't compile this module */ #if !defined( HB_OS_DOS ) && \ !defined( HB_OS_DARWIN_5 ) && \ - ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) ) && \ + ! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) && \ !defined( HB_OS_WIN_64 ) -#if defined( HB_OS_UNIX ) || defined (HB_OS_OS2_GCC) +#if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC ) #include #include #include @@ -127,7 +127,7 @@ static int s_translateSignal( UINT sig, UINT subsig ); * signals, both from kernel or from users. *****************************************************************************/ -#if defined(HB_OS_UNIX) || defined (HB_OS_OS2_GCC) +#if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC ) /* TODO: Register the old signal action to allow graceful fallback static struct sigaction sa_oldAction[ SIGUSR2 + 1 ]; */ @@ -264,7 +264,7 @@ static void s_signalHandler( int sig, siginfo_t * info, void * v ) /* 2003 - to fix as soon as thread support is ready on OS/2 */ -#if defined(HB_THREAD_SUPPORT) && ! defined(HB_OS_OS2) +#if defined( HB_THREAD_SUPPORT ) && ! defined( HB_OS_OS2 ) static void * s_signalListener( void * my_stack ) { static BOOL bFirst = TRUE; @@ -581,10 +581,10 @@ BOOL WINAPI s_ConsoleHandlerRoutine( DWORD dwCtrlType ) static void s_serviceSetHBSig( void ) { -#if defined( HB_OS_UNIX ) || defined(HB_OS_OS2_GCC) +#if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC ) struct sigaction act; - #if defined(HB_THREAD_SUPPORT) && ! defined(HB_OS_OS2) + #if defined( HB_THREAD_SUPPORT ) && ! defined( HB_OS_OS2 ) sigset_t blockall; /* set signal mask */ sigemptyset( &blockall ); @@ -938,13 +938,13 @@ HB_FUNC( HB_SIGNALDESC ) int iSubSig = hb_parni( 2 ); /* UNIX MESSGES */ - #if defined (HB_OS_UNIX) || defined(HB_OS_OS2_GCC) + #if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC ) switch( iSig ) { case SIGSEGV: switch( iSubSig ) { - #if ! defined(HB_OS_BSD) && ! defined(HB_OS_OS2_GCC) && ! defined( __WATCOMC__ ) + #if ! defined( HB_OS_BSD ) && ! defined( HB_OS_OS2_GCC ) && ! defined( __WATCOMC__ ) case SEGV_MAPERR: hb_retc_const( "Segmentation fault: address not mapped to object"); return; case SEGV_ACCERR: hb_retc_const( "Segmentation fault: invalid permissions for mapped object"); return; #endif @@ -953,7 +953,7 @@ HB_FUNC( HB_SIGNALDESC ) case SIGILL: switch( iSubSig ) { - #if ! defined(HB_OS_BSD) && ! defined(HB_OS_OS2_GCC) && ! defined( __WATCOMC__ ) + #if ! defined( HB_OS_BSD ) && ! defined( HB_OS_OS2_GCC ) && ! defined( __WATCOMC__ ) case ILL_ILLOPC: hb_retc_const( "Illegal operation: illegal opcode"); return; case ILL_ILLOPN: hb_retc_const( "Illegal operation: illegal operand"); return; case ILL_ILLADR: hb_retc_const( "Illegal operation: illegal addressing mode"); return; @@ -968,7 +968,7 @@ HB_FUNC( HB_SIGNALDESC ) case SIGFPE: switch( iSubSig ) { - #if ! defined(HB_OS_OS2_GCC) && ! defined( __WATCOMC__ ) + #if ! defined( HB_OS_OS2_GCC ) && ! defined( __WATCOMC__ ) #if ! defined( HB_OS_DARWIN ) case FPE_INTDIV: hb_retc_const( "Floating point: integer divide by zero"); return; case FPE_INTOVF: hb_retc_const( "Floating point: integer overflow"); return; diff --git a/harbour/contrib/xhb/ttable.ch b/harbour/contrib/xhb/ttable.ch index b0cdca7900..f445439652 100644 --- a/harbour/contrib/xhb/ttable.ch +++ b/harbour/contrib/xhb/ttable.ch @@ -115,7 +115,7 @@ <.lshared.>, ; <(cPathDBF)>, ; <.lnew.>, ; - <.lrdonly.> ) + <.lrdonly.> ) // --> new order object diff --git a/harbour/contrib/xhb/wintypes.ch b/harbour/contrib/xhb/wintypes.ch index 58ace9f005..5c8ba8c445 100644 --- a/harbour/contrib/xhb/wintypes.ch +++ b/harbour/contrib/xhb/wintypes.ch @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * www - http://www.harbour-project.org * diff --git a/harbour/contrib/xhb/xhbcopyf.c b/harbour/contrib/xhb/xhbcopyf.c index d6b99921c1..74b3086682 100644 --- a/harbour/contrib/xhb/xhbcopyf.c +++ b/harbour/contrib/xhb/xhbcopyf.c @@ -56,7 +56,7 @@ #include "hbapiitm.h" #include "hbvm.h" -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) #include #include #endif @@ -92,7 +92,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pB if( fhndDest != FS_ERROR ) { -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) struct stat struFileInfo; int iSuccess = fstat( fhndSource, &struFileInfo ); #endif @@ -129,7 +129,7 @@ static BOOL hb_copyfile( const char * szSource, const char * szDest, PHB_ITEM pB hb_xfree( buffer ); -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) if( iSuccess == 0 ) fchmod( fhndDest, struFileInfo.st_mode ); #endif diff --git a/harbour/contrib/xhb/xhbextrn.ch b/harbour/contrib/xhb/xhbextrn.ch index 1366cf1163..4f3189913e 100644 --- a/harbour/contrib/xhb/xhbextrn.ch +++ b/harbour/contrib/xhb/xhbextrn.ch @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * www - http://www.harbour-project.org diff --git a/harbour/contrib/xhb/xhbfunc.c b/harbour/contrib/xhb/xhbfunc.c index 7ca880cd5d..fa6e5dfec2 100644 --- a/harbour/contrib/xhb/xhbfunc.c +++ b/harbour/contrib/xhb/xhbfunc.c @@ -96,9 +96,9 @@ HB_FUNC( HB_CMDARGARGV ) HB_FUNC( HB_VMMODE ) { -#if defined(HB_NO_PROFILER) && defined(HB_NO_TRACE) && !defined(HB_GUI) +#if defined( HB_NO_PROFILER ) && defined( HB_NO_TRACE ) && !defined( HB_GUI ) hb_retni( 2 ); /* optimized for console applications */ -#elif defined(HB_NO_PROFILER) && defined(HB_NO_TRACE) && defined(HB_GUI) +#elif defined( HB_NO_PROFILER ) && defined( HB_NO_TRACE ) && defined( HB_GUI ) hb_retni( 1 ); /* optimized for gui applications */ #else hb_retni( 0 ); /* no optimization */ diff --git a/harbour/contrib/xpp/philesx.c b/harbour/contrib/xpp/philesx.c index cbd22a2179..7bedf980f4 100644 --- a/harbour/contrib/xpp/philesx.c +++ b/harbour/contrib/xpp/philesx.c @@ -56,7 +56,7 @@ HB_FUNC( CURDRIVE ) { -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) char szCurDrive[ 1 ]; const char * szDrive; diff --git a/harbour/examples/hboleold/win_ole.c b/harbour/examples/hboleold/win_ole.c index 7484f5c092..aa6f7a21ba 100644 --- a/harbour/examples/hboleold/win_ole.c +++ b/harbour/examples/hboleold/win_ole.c @@ -88,11 +88,11 @@ WINOLEAUTAPI VarR8FromDec(DECIMAL *pdecIn, DOUBLE *pdblOut); #endif -#if ( defined(__DMC__) || defined(__MINGW32__) || ( defined(__WATCOMC__) && !defined(__FORCE_LONG_LONG__) ) ) +#if ( defined( __DMC__ ) || defined( __MINGW32__ ) || ( defined( __WATCOMC__ ) && !defined( __FORCE_LONG_LONG__ ) ) ) #define HB_LONG_LONG_OFF #endif -#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined(__WATCOMC__) && ( __WATCOMC__ >= 1280 ) ) ) +#if defined( __cplusplus ) && ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || ( defined( __WATCOMC__ ) && ( __WATCOMC__ >= 1280 ) ) ) # define HB_ID_REF( type, id ) id #else # define HB_ID_REF( type, id ) ( ( type ) &id ) diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h index b4d7603d41..5f2b182fd2 100644 --- a/harbour/include/clipdefs.h +++ b/harbour/include/clipdefs.h @@ -84,7 +84,7 @@ typedef USHORT * USHORTP; typedef USHORTP PUSHORT; #endif -#if !(defined(HB_OS_WIN) && defined(HB_OS_WIN_USED)) +#if !( defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) ) typedef unsigned int WORD; typedef WORD * WORDP; typedef WORDP PWORD; @@ -112,7 +112,7 @@ typedef BOOLP PBOOL; typedef void * NEARP; typedef NEARP * NEARPP; -#if !(defined(HB_OS_WIN) && defined(HB_OS_WIN_USED)) +#if !( defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) ) typedef void * FARP; typedef FARP * FARPP; typedef FARP VOIDP; diff --git a/harbour/include/extend.api b/harbour/include/extend.api index 449c75d638..bb413abe5b 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -69,7 +69,7 @@ typedef PHB_ITEM ITEM; #define CHARACTER HB_IT_STRING #define NUMERIC HB_IT_NUMERIC #define LOGICAL HB_IT_LOGICAL -#if !(defined(HB_OS_WIN) && defined(HB_OS_WIN_USED)) +#if !( defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) ) #define DATE HB_IT_DATE #endif #define ALIAS HB_IT_ALIAS @@ -77,12 +77,12 @@ typedef PHB_ITEM ITEM; #define MEMO HB_IT_MEMO /* NOTE: CA-Cl*pper bug: WORD will conflict with the typedef with the same name in clipdefs.h [vszakats] */ -#if !(defined(HB_OS_WIN) && defined(HB_OS_WIN_USED)) +#if !( defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) ) #define WORD ( HB_IT_INTEGER | HB_IT_LONG ) #endif #define ARRAY HB_IT_ARRAY #define BLOCK HB_IT_BLOCK -#if !(defined(HB_OS_WIN) && defined(HB_OS_WIN_USED)) +#if !( defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) ) #define DOUBLE HB_IT_DOUBLE #endif diff --git a/harbour/include/hb_io.h b/harbour/include/hb_io.h index d51bd1875b..cb0546f8b8 100644 --- a/harbour/include/hb_io.h +++ b/harbour/include/hb_io.h @@ -53,16 +53,16 @@ #ifndef HB__IO_H_ #define HB__IO_H_ -#if defined(HB_OS_UNIX_COMPATIBLE) || \ - ( defined(__GNUC__) && ! defined(__MINGW32__) ) +#if defined( HB_OS_UNIX_COMPATIBLE ) || \ + ( defined( __GNUC__ ) && ! defined( __MINGW32__ ) ) #include - #if defined(__DJGPP__) || defined(__CYGWIN__) || defined(__EMX__) + #if defined( __DJGPP__ ) || defined( __CYGWIN__ ) || defined( __EMX__ ) #include #endif -#elif !defined(HB_OS_WIN_CE) +#elif !defined( HB_OS_WIN_CE ) #include #endif -#if defined(HB_OS_DOS) && !defined(__RSX32__) +#if defined( HB_OS_DOS ) && !defined( __RSX32__ ) #include #endif diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 3a0330ae39..fc5615955b 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -70,7 +70,7 @@ #endif #if defined( __XCC__ ) || defined( __POCC__ ) || defined( __LCC__ ) || \ - defined( __MINGW32__ ) || defined(__DMC__) || \ + defined( __MINGW32__ ) || defined( __DMC__ ) || \ ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 ) || \ ( defined( __WATCOMC__ ) && __WATCOMC__ >= 1270 ) || \ ( defined( __GNUC__ ) && \ @@ -157,11 +157,11 @@ #include - #if defined(__WATCOMC__) && defined(__386__) && !defined(__WINDOWS_386__) + #if defined( __WATCOMC__ ) && defined( __386__ ) && !defined( __WINDOWS_386__ ) #define HB_DOS_INT86 int386 #define HB_DOS_INT86X int386x #define HB_XREGS w - #elif defined(__RSX32__) + #elif defined( __RSX32__ ) #define HB_DOS_INT86 _int86 #define HB_DOS_INT86X _int86x #define HB_XREGS x @@ -246,16 +246,16 @@ #ifndef HB_LONG_LONG_OFF - #if ! defined(HB_DONT_DEFINE_BASIC_TYPES) && ! defined(_WINNT_H) - #if !defined(LONGLONG) - #if defined(__GNUC__) + #if ! defined( HB_DONT_DEFINE_BASIC_TYPES ) && ! defined( _WINNT_H ) + #if !defined( LONGLONG ) + #if defined( __GNUC__ ) typedef signed long long LONGLONG; #else typedef __int64 LONGLONG; #endif #endif - #if !defined(ULONGLONG) - #if defined(__GNUC__) + #if !defined( ULONGLONG ) + #if defined( __GNUC__ ) typedef unsigned long long ULONGLONG; #else typedef unsigned __int64 ULONGLONG; @@ -263,34 +263,34 @@ #endif #endif - #if !defined(ULONGLONG_MAX) - #if defined(_UI64_MAX) + #if !defined( ULONGLONG_MAX ) + #if defined( _UI64_MAX ) #define ULONGLONG_MAX _UI64_MAX - #elif defined(ULLONG_MAX) + #elif defined( ULLONG_MAX ) #define ULONGLONG_MAX ULLONG_MAX - #elif defined(ULONG_LONG_MAX) + #elif defined( ULONG_LONG_MAX ) #define ULONGLONG_MAX ULONG_LONG_MAX #else #define ULONGLONG_MAX 18446744073709551615ULL #endif #endif - #if !defined(LONGLONG_MAX) - #if defined(_I64_MAX) + #if !defined( LONGLONG_MAX ) + #if defined( _I64_MAX ) #define LONGLONG_MAX _I64_MAX - #elif defined(LLONG_MAX) + #elif defined( LLONG_MAX ) #define LONGLONG_MAX LLONG_MAX - #elif defined(LONG_LONG_MAX) + #elif defined( LONG_LONG_MAX ) #define LONGLONG_MAX LONG_LONG_MAX #else #define LONGLONG_MAX 9223372036854775807LL #endif #endif - #if !defined(LONGLONG_MIN) - #if defined(_I64_MIN) + #if !defined( LONGLONG_MIN ) + #if defined( _I64_MIN ) #define LONGLONG_MIN _I64_MIN - #elif defined(LLONG_MIN) + #elif defined( LLONG_MIN ) #define LONGLONG_MIN LLONG_MIN - #elif defined(LONG_LONG_MIN) + #elif defined( LONG_LONG_MIN ) #define LONGLONG_MIN LONG_LONG_MIN #else #define LONGLONG_MIN (-LONGLONG_MAX - 1LL) @@ -1495,19 +1495,19 @@ typedef long hbVMIntMax; /* TOFIX */ * starting procedure (due to unknown order of static data initialization) */ #define HB_START_PROCEDURE "MAIN" -#if defined(__WATCOMC__) || defined(__DMC__) || \ - ( defined(__GNUC__) && !defined(__DJGPP__) && !defined(HB_OS_OS2_GCC) ) +#if defined( __WATCOMC__ ) || defined( __DMC__ ) || \ + ( defined( __GNUC__ ) && !defined( __DJGPP__ ) && !defined( HB_OS_OS2_GCC ) ) #define HB_START_PROC_STRICT #endif -#if defined(__WATCOMC__) || defined(__DMC__) || \ - defined(_MSC_VER) || defined(__POCC__) +#if defined( __WATCOMC__ ) || defined( __DMC__ ) || \ + defined( _MSC_VER ) || defined( __POCC__ ) #define HB_DLL_ENTRY_POINT DllMain #else #define HB_DLL_ENTRY_POINT DllEntryPoint #endif -#if defined(HB_FUNC_CALLCONV) +#if defined( HB_FUNC_CALLCONV ) #define HARBOUR void HB_FUNC_CALLCONV #else #define HARBOUR void diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index 3b509a2893..05213094a0 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -444,7 +444,7 @@ static HB_EXPR_FUNC( hb_compExprUseCodeblock ) break; case HB_EA_PUSH_PCODE: { -#if defined(HB_MACRO_SUPPORT) +#if defined( HB_MACRO_SUPPORT ) HB_EXPR_PCODE1( hb_compExprCodeblockPush, pSelf ); #else if( pSelf->value.asCodeblock.flags & HB_BLOCK_EXT ) @@ -1356,19 +1356,10 @@ static HB_EXPR_FUNC( hb_compExprUseArrayAt ) { if( HB_IS_VALID_INDEX( lIndex, pExpr->ulLength ) ) { -#if defined( HB_COMPAT_X HB ) - char * pszValue = ( char * ) hb_xgrab( 2 ); - pszValue[ 0 ] = pExpr->value.asString.string[ lIndex - 1 ]; - pszValue[ 1 ] = '\0'; - - HB_COMP_EXPR_DELETE( pSelf ); - pSelf = hb_compExprNewString( pszValue, 1, TRUE, HB_COMP_PARAM ); -#else UCHAR ucValue = ( UCHAR ) pExpr->value.asString.string[ lIndex - 1 ]; HB_COMP_EXPR_DELETE( pSelf ); pSelf = hb_compExprNewLong( ucValue, HB_COMP_PARAM ); -#endif } else hb_compErrorBound( HB_COMP_PARAM, pIdx ); @@ -4407,7 +4398,7 @@ static void hb_compExprCodeblockPush( HB_EXPR_PTR pSelf, BOOL bLateEval, HB_COMP /* This generates a push pcode for early evaluation of a macro */ -#if !defined(HB_MACRO_SUPPORT) +#if !defined( HB_MACRO_SUPPORT ) static void hb_compExprCodeblockExtPush( HB_EXPR_PTR pSelf, HB_COMP_DECL ) { hb_compGenPCodeN( ( BYTE * ) pSelf->value.asCodeblock.string, diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h index 40b988ebf5..ef53562a44 100644 --- a/harbour/include/hbinit.h +++ b/harbour/include/hbinit.h @@ -59,18 +59,18 @@ HB_EXTERN_BEGIN extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols, const char * szModuleName, ULONG ulID, USHORT uiPcodeVer ); /* module symbols initialization with extended information */ -#if defined(_MSC_VER) && \ - !defined(__LCC__) && !defined(__POCC__) && !defined(__XCC__) +#if defined( _MSC_VER ) && \ + !defined( __LCC__ ) && !defined( __POCC__ ) && !defined( __XCC__ ) - #if !defined(__cplusplus) + #if !defined( __cplusplus ) /* we do not have better startup initialization method for pure * C mode in MSC */ #define HB_MSC_STARTUP - #elif !defined(HB_STRICT_ANSI_C) && !defined(HB_STATIC_STARTUP) && \ - !defined(HB_PRAGMA_STARTUP) && !defined(HB_MSC_STARTUP) + #elif !defined( HB_STRICT_ANSI_C ) && !defined( HB_STATIC_STARTUP ) && \ + !defined( HB_PRAGMA_STARTUP ) && !defined( HB_MSC_STARTUP ) /* Sat 07 Maj 2005 02:46:38 CEST * This is only necessary when you want to create binary libs using @@ -92,7 +92,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #define HB_INIT_SYMBOLS_END( func ) HB_INIT_SYMBOLS_EX_END( func, __FILE__, 0L, 0x0000 ) -#if defined(HB_STRICT_ANSI_C) +#if defined( HB_STRICT_ANSI_C ) #define HB_INIT_SYMBOLS_BEGIN( func ) \ static HB_SYMB symbols_table[] = { @@ -112,9 +112,9 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #define HB_CALL_ON_STARTUP_END( func ) \ } -#elif defined(__GNUC__) +#elif defined( __GNUC__ ) - #if defined(HB_PRAGMA_STARTUP) || defined(HB_MSC_STARTUP) + #if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) #error Wrong macros set for startup code - clean your make/env settings. #endif @@ -136,7 +136,7 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo #define HB_CALL_ON_STARTUP_END( func ) \ } -#elif defined(HB_MSC_STARTUP) +#elif defined( HB_MSC_STARTUP ) typedef int (* HB_$INITSYM)( void ); @@ -170,9 +170,9 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo output of a generated prg for example */ -#elif defined(HB_STATIC_STARTUP) || defined(__cplusplus) +#elif defined( HB_STATIC_STARTUP ) || defined( __cplusplus ) - #if defined(HB_PRAGMA_STARTUP) || defined(HB_MSC_STARTUP) + #if defined( HB_PRAGMA_STARTUP ) || defined( HB_MSC_STARTUP ) #error Wrong macros set for startup code - clean your make/env settings. #endif @@ -197,14 +197,14 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo } \ static int static_int_##func = func(); -#elif defined(HB_PRAGMA_STARTUP) || \ - defined(__BORLANDC__) || defined(__LCC__) || defined(__POCC__) || defined(__XCC__) +#elif defined( HB_PRAGMA_STARTUP ) || \ + defined( __BORLANDC__ ) || defined( __LCC__ ) || defined( __POCC__ ) || defined( __XCC__ ) - #if defined(HB_MSC_STARTUP) + #if defined( HB_MSC_STARTUP ) #error Wrong macros set for startup code - clean your make/env settings. #endif - #if !defined(HB_PRAGMA_STARTUP) + #if !defined( HB_PRAGMA_STARTUP ) #define HB_PRAGMA_STARTUP #endif diff --git a/harbour/include/hbmath.h b/harbour/include/hbmath.h index 4ea0eb9dd6..1342fadebe 100644 --- a/harbour/include/hbmath.h +++ b/harbour/include/hbmath.h @@ -56,7 +56,7 @@ #include "hbapi.h" -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) #include #else #include @@ -64,13 +64,13 @@ HB_EXTERN_BEGIN -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) #define HB_MATH_HANDLER - #if (__WATCOMC__ > 1000) /* && defined(__cplusplus) */ + #if ( __WATCOMC__ > 1000 ) /* && defined( __cplusplus ) */ #define exception _exception #endif -#elif defined(__BORLANDC__) - #if (__BORLANDC__ == 1328) && defined(__cplusplus) +#elif defined( __BORLANDC__ ) + #if ( __BORLANDC__ == 1328 ) && defined( __cplusplus ) /* NOTE: There seem to be a bug in Borland C++ 5.3 C++ mode which prevents the redefinition of matherr, because nor "_exception" neither "exception" will work. [vszakats] */ @@ -78,32 +78,32 @@ HB_EXTERN_BEGIN #define HB_MATH_HANDLER #define matherr _matherr /* NOTE: This is needed for Borland C++ 5.5 in C++/STDC mode. [vszakats] */ - #if (__BORLANDC__ >= 1360) + #if ( __BORLANDC__ >= 1360 ) #define exception _exception #endif #endif -#elif defined(__MINGW32CE__) +#elif defined( __MINGW32CE__ ) #define HB_MATH_HANDLER #define matherr _matherr #define exception _exception /* it seems that MinGW has some problem with MATH HANDLER use HB_MATH_ERRNO instead */ -#elif defined(__MINGW32__) && 0 +#elif defined( __MINGW32__ ) && 0 #define HB_MATH_HANDLER #define matherr _matherr #define exception _exception -#elif defined(__DJGPP__) - #ifndef __cplusplus +#elif defined( __DJGPP__ ) + #if !defined( __cplusplus ) #define HB_MATH_HANDLER #endif #elif defined( HB_OS_WIN_CE ) && defined( __POCC__ ) - /* NOTE: Workaround for Pellec C 5.00 not having an 'inf' (HUGE_VAL) + /* NOTE: Workaround for Pellec C 5.00 not having an 'inf' (HUGE_VAL) in '-Tarm-coff' mode. [vszakats] */ #undef HUGE_VAL #define HUGE_VAL ( 1.0 / ( 1.0, 0.0 ) ) #endif -#if !defined(HB_MATH_HANDLER) && defined(__GNUC__) /* && defined(HB_OS_UNIX) */ +#if !defined( HB_MATH_HANDLER ) && defined( __GNUC__ ) /* && defined( HB_OS_UNIX ) */ #define HB_MATH_ERRNO #endif diff --git a/harbour/include/hbregex.h b/harbour/include/hbregex.h index 2405374f3e..6af83aa527 100644 --- a/harbour/include/hbregex.h +++ b/harbour/include/hbregex.h @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * www - http://www.harbour-project.org @@ -72,7 +72,7 @@ #else # define HB_PCRE_REGEX # define PCRE_STATIC -# if defined(__XCC__) || defined(__LCC__) +# if defined( __XCC__ ) || defined( __LCC__ ) # include "source\hbpcre\pcre.h" # else # include "../source/hbpcre/pcre.h" diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 02d8b6a47c..18dd9a0539 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -179,10 +179,10 @@ /* *********************************************************************** * Operating system specific definitions */ -#if ( defined(__GNUC__) && \ - ! ( defined(__DJGPP__) || defined(__EMX__) || defined(__RSXNT__) || \ - defined(_Windows) || defined(_WIN32) || defined(_WINCE) ) ) || \ - ( defined(__WATCOMC__) && defined(__LINUX__) ) +#if ( defined( __GNUC__ ) && \ + ! ( defined( __DJGPP__ ) || defined( __EMX__ ) || defined( __RSXNT__ ) || \ + defined( _Windows ) || defined( _WIN32 ) || defined( _WINCE ) ) ) || \ + ( defined( __WATCOMC__ ) && defined( __LINUX__ ) ) #define HB_OS_UNIX_COMPATIBLE #define HB_OS_PATH_LIST_SEP_CHR ':' #define HB_OS_PATH_DELIM_CHR '/' @@ -239,14 +239,14 @@ * Platform detection */ -#if defined(__WATCOMC__) - #if defined(__OS2__) +#if defined( __WATCOMC__ ) + #if defined( __OS2__ ) #define HB_OS_OS2 - #elif defined(__NT__) || defined(__WINDOWS_386__) || defined(__WINDOWS__) + #elif defined( __NT__ ) || defined( __WINDOWS_386__ ) || defined( __WINDOWS__ ) #define HB_OS_WIN - #elif defined(__LINUX__) + #elif defined( __LINUX__ ) #define HB_OS_LINUX - #elif defined(__386__) + #elif defined( __386__ ) #define HB_OS_DOS #define HB_OS_DOS_32 #else @@ -256,9 +256,9 @@ #endif #ifndef HB_OS_DOS - #if defined(DOS) || defined(_QC) || defined(__DOS__) || defined(MSDOS) || defined(__MSDOS__) || defined(__RSX32__) + #if defined( DOS ) || defined( _QC ) || defined( __DOS__ ) || defined( MSDOS ) || defined( __MSDOS__ ) || defined( __RSX32__ ) #define HB_OS_DOS - #if defined(__386__) || defined(__DJGPP__) + #if defined( __386__ ) || defined( __DJGPP__ ) #define HB_OS_DOS_32 #else #define HB_OS_DOS_16 @@ -266,17 +266,17 @@ #endif #endif -#if defined(__EMX__) && ! defined(__RSXNT__) +#if defined( __EMX__ ) && ! defined( __RSXNT__ ) #define HB_OS_OS2_GCC #endif #ifndef HB_OS_OS2 - #if defined(OS2) || defined(__OS2__) || defined(OS_2) || defined(HB_OS_OS2_GCC) + #if defined( OS2 ) || defined( __OS2__ ) || defined( OS_2 ) || defined( HB_OS_OS2_GCC ) #define HB_OS_OS2 #endif #endif #ifndef HB_OS_WIN - #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) || defined(__WIN32__) || defined(__CYGWIN__) + #if defined( WINNT ) || defined( _Windows ) || defined( __NT__ ) || defined( _WIN32 ) || defined( _WINDOWS_ ) || defined( __WINDOWS_386__ ) || defined( __WIN32__ ) || defined( __CYGWIN__ ) #define HB_OS_WIN /* Compatibility. Do not use this. */ #ifdef HB_LEGACY_LEVEL2 @@ -287,14 +287,14 @@ /* Sub-option inside HB_OS_WIN */ #ifndef HB_OS_WIN_64 - #if defined(_WIN64) + #if defined( _WIN64 ) #define HB_OS_WIN_64 #endif #endif /* Sub-option inside HB_OS_WIN */ #ifndef HB_OS_WIN_CE - #if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__) + #if defined( _WINCE ) || defined( __CEGCC__ ) || defined( __MINGW32CE__ ) #define HB_OS_WIN_CE /* Compatibility. Do not use this. */ #ifdef HB_LEGACY_LEVEL2 @@ -304,26 +304,26 @@ #endif #ifndef HB_OS_LINUX - #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__) + #if defined( linux ) || defined( __linux ) || defined( __linux__ ) || defined( __gnu_linux__ ) #define HB_OS_LINUX #endif #endif #ifndef HB_OS_SUNOS - #if defined(sun) || defined(__sun) || defined(__sun__) + #if defined( sun ) || defined( __sun ) || defined( __sun__ ) #define HB_OS_SUNOS #endif #endif #ifndef HB_OS_HPUX /* HP cc in ANSI mode defines __hpux. GCC defines __hpux__ */ - #if defined(__hpux) || defined(__hpux__) + #if defined( __hpux ) || defined( __hpux__ ) #define HB_OS_HPUX #endif #endif #ifndef HB_OS_DARWIN - #if defined(__APPLE__) + #if defined( __APPLE__ ) #define HB_OS_DARWIN #endif #endif @@ -336,12 +336,12 @@ #endif #ifndef HB_OS_UNIX - #if defined(HB_OS_UNIX_COMPATIBLE) || \ - defined(HB_OS_LINUX) || \ - defined(HB_OS_DARWIN) || \ - defined(HB_OS_BSD) || \ - defined(HB_OS_SUNOS) || \ - defined(HB_OS_HPUX) + #if defined( HB_OS_UNIX_COMPATIBLE ) || \ + defined( HB_OS_LINUX ) || \ + defined( HB_OS_DARWIN ) || \ + defined( HB_OS_BSD ) || \ + defined( HB_OS_SUNOS ) || \ + defined( HB_OS_HPUX ) #define HB_OS_UNIX #endif #endif @@ -355,110 +355,110 @@ http://poshlib.hookatooka.com/poshlib/trac.cgi/browser/posh.h */ -#if defined(__alpha__) || \ - defined(__alpha) || \ - defined(alpha) || \ - defined(_M_ALPHA) +#if defined( __alpha__ ) || \ + defined( __alpha ) || \ + defined( alpha ) || \ + defined( _M_ALPHA ) #define HB_CPU_ALPHA -#elif defined(__amd64__) || \ - defined(__amd64) || \ - defined(__x86_64__) || \ - defined(__x86_64) || \ - defined(_M_AMD64) || \ - defined(_M_X64) || \ - defined(__MINGW64__) +#elif defined( __amd64__ ) || \ + defined( __amd64 ) || \ + defined( __x86_64__ ) || \ + defined( __x86_64 ) || \ + defined( _M_AMD64 ) || \ + defined( _M_X64 ) || \ + defined( __MINGW64__ ) #define HB_CPU_X86_64 -#elif defined(__arm__) || \ - defined(ARM) || \ - defined(_ARM) || \ - defined(_M_ARM) +#elif defined( __arm__ ) || \ + defined( ARM ) || \ + defined( _ARM ) || \ + defined( _M_ARM ) #define HB_CPU_ARM -#elif defined(__hppa__) || \ - defined(__hppa) || \ - defined(hppa) +#elif defined( __hppa__ ) || \ + defined( __hppa ) || \ + defined( hppa ) #define HB_CPU_PARISC -#elif defined(i386) || \ - defined(__i386__) || \ - defined(__i386) || \ - defined(_M_IX86) || \ - defined(__X86__) || \ - defined(_X86_) || \ - defined(__I86__) || \ - defined(__THW_INTEL__) || \ - defined(__INTEL__) +#elif defined( i386 ) || \ + defined( __i386__ ) || \ + defined( __i386 ) || \ + defined( _M_IX86 ) || \ + defined( __X86__ ) || \ + defined( _X86_ ) || \ + defined( __I86__ ) || \ + defined( __THW_INTEL__ ) || \ + defined( __INTEL__ ) #define HB_CPU_X86 -#elif defined(__ia64__) || \ - defined(__ia64) || \ - defined(_IA64) || \ - defined(__IA64__) || \ - defined(_M_IA64) +#elif defined( __ia64__ ) || \ + defined( __ia64 ) || \ + defined( _IA64 ) || \ + defined( __IA64__ ) || \ + defined( _M_IA64 ) #define HB_CPU_IA_64 -#elif defined(__m68k__) || \ - defined(M68000) +#elif defined( __m68k__ ) || \ + defined( M68000 ) #define HB_CPU_M68K -#elif defined(__mips__) || \ - defined(__mips) || \ - defined(__MIPS__) || \ - defined(mips) || \ - defined(_MIPS) || \ - defined(__MIPS__) || \ - defined(_M_MRX000) || \ - defined(_M_MIPS) +#elif defined( __mips__ ) || \ + defined( __mips ) || \ + defined( __MIPS__ ) || \ + defined( mips ) || \ + defined( _MIPS ) || \ + defined( __MIPS__ ) || \ + defined( _M_MRX000 ) || \ + defined( _M_MIPS ) #define HB_CPU_MIPS -#elif defined(__powerpc64__) +#elif defined( __powerpc64__ ) #define HB_CPU_PPC_64 -#elif defined(__powerpc__) || \ - defined(__powerpc) || \ - defined(__POWERPC__) || \ - defined(__ppc__) || \ - defined(__PPC__) || \ - defined(_ARCH_PPC) || \ - defined(_M_MPPC) || \ - defined(_M_PPC) +#elif defined( __powerpc__ ) || \ + defined( __powerpc ) || \ + defined( __POWERPC__ ) || \ + defined( __ppc__ ) || \ + defined( __PPC__ ) || \ + defined( _ARCH_PPC ) || \ + defined( _M_MPPC ) || \ + defined( _M_PPC ) #define HB_CPU_PPC -#elif defined(__THW_RS6000) || \ - defined(_IBMR2) || \ - defined(_POWER) || \ - defined(_ARCH_PWR) || \ - defined(_ARCH_PWR2) +#elif defined( __THW_RS6000 ) || \ + defined( _IBMR2 ) || \ + defined( _POWER ) || \ + defined( _ARCH_PWR ) || \ + defined( _ARCH_PWR2 ) #define HB_CPU_POWER -#elif defined(__sparc__) || \ - defined(__sparc) - #if defined(__arch64__) || \ - defined(__sparcv9) || \ - defined(__sparc_v9__) +#elif defined( __sparc__ ) || \ + defined( __sparc ) + #if defined( __arch64__ ) || \ + defined( __sparcv9 ) || \ + defined( __sparc_v9__ ) #define HB_CPU_SPARC_64 #else #define HB_CPU_SPARC #endif -#elif defined(__sh__) || \ - defined(_SH3) || \ - defined(__sh4__) || \ - defined(__SH4__) || \ - defined(_M_SH) +#elif defined( __sh__ ) || \ + defined( _SH3 ) || \ + defined( __sh4__ ) || \ + defined( __SH4__ ) || \ + defined( _M_SH ) #define HB_CPU_SUPERH -#elif defined(__370__) || \ - defined(__THW_370__) +#elif defined( __370__ ) || \ + defined( __THW_370__ ) #define HB_CPU_SYS370 -#elif defined(__s390__) || \ - defined(__s390x__) +#elif defined( __s390__ ) || \ + defined( __s390x__ ) #define HB_CPU_SYS390 -#elif defined(__SYSC_ZARCH__) +#elif defined( __SYSC_ZARCH__ ) #define HB_CPU_ZARCH #endif @@ -474,7 +474,7 @@ #define HB_OS_EOL_LEN 2 #endif -#if defined(HB_OS_WIN_CE) && defined(HB_MT_VM) +#if defined( HB_OS_WIN_CE ) && defined( HB_MT_VM ) #undef HB_MT_VM #endif @@ -488,7 +488,7 @@ * Extern "C" detection */ -#if defined(__cplusplus) && !defined(__IBMCPP__) +#if defined( __cplusplus ) && !defined( __IBMCPP__ ) #define HB_EXTERN_C #define HB_EXTERN_BEGIN extern "C" { #define HB_EXTERN_END } diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h index b19dcd4ce9..173a6f17bd 100644 --- a/harbour/include/hbvmpub.h +++ b/harbour/include/hbvmpub.h @@ -56,7 +56,7 @@ #include "hbdefs.h" /* Maximum symbol name length handled by Harbour compiler and runtime. - For strict CA-Cl*pper compatibility a value of 10 would have + For strict CA-Cl*pper compatibility a value of 10 would have to be used, but Harbour won't properly compile using this setting. */ #define HB_SYMBOL_NAME_LEN 63 @@ -71,7 +71,7 @@ struct _HB_SYMB; # define HB_OBJ_CLASS( p ) ( ( p )->item.asArray.value->uiClass ) # define HB_ARRAY_OBJ( p ) ( ( p )->item.asArray.value->uiClass != 0 ) -# if defined(__GNUC__) +# if defined( __GNUC__ ) # define HB_ITEM_NIL { HB_IT_NIL, {} } # else # define HB_ITEM_NIL { HB_IT_NIL, NULL } diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h index aa485da0d6..1a7eb2a26b 100644 --- a/harbour/include/hbwince.h +++ b/harbour/include/hbwince.h @@ -53,16 +53,16 @@ #ifndef HB_WINCE_H_ #define HB_WINCE_H_ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) HB_EXTERN_BEGIN -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) # undef HB_OS_HAS_DRIVE_LETTER -/* defined(__CEGCC__) || defined(__MINGW32CE__) */ +/* defined( __CEGCC__ ) || defined( __MINGW32CE__ ) */ -#if defined(__MINGW32CE__) && 0 +#if defined( __MINGW32CE__ ) && 0 typedef long clock_t; extern clock_t clock( void ); #endif @@ -189,7 +189,7 @@ extern void hb_mbtowccpy( wchar_t *dstW, const char *srcA, unsigned long ulLen ) extern void hb_mbtowcset( wchar_t *dstW, const char *srcA, unsigned long ulLen ); extern void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned long ulLen ); -#if defined(UNICODE) +#if defined( UNICODE ) #define HB_TCHAR_CPTO(d,s,l) hb_mbtowccpy(d,s,l) #define HB_TCHAR_GETFROM(d,s,l) hb_wctombget(d,s,l) diff --git a/harbour/include/hbzlib.h b/harbour/include/hbzlib.h index a192206813..a10fe34a75 100644 --- a/harbour/include/hbzlib.h +++ b/harbour/include/hbzlib.h @@ -53,7 +53,7 @@ #if defined( HB_EXT_ZLIB ) # include #else -# if defined(__XCC__) || defined(__LCC__) +# if defined( __XCC__ ) || defined( __LCC__ ) # include "source\hbzlib\zlib.h" # else # include "../source/hbzlib/zlib.h" diff --git a/harbour/source/codepage/cpes850c.c b/harbour/source/codepage/cpes850c.c index 12e8c3ac91..8430e29507 100644 --- a/harbour/source/codepage/cpes850c.c +++ b/harbour/source/codepage/cpes850c.c @@ -83,9 +83,9 @@ same excepting the characters case, of course. */ -static HB_CODEPAGE s_codepage = { "ES850C", +static HB_CODEPAGE s_codepage = { "ES850C", HB_CPID_850, HB_UNITB_850, NUMBER_OF_CHARACTERS, - "AµBCDEFGHIÖJKLMN¥OàPQRSTUéšVWXYZ", + "AµBCDEFGHIÖJKLMN¥OàPQRSTUéšVWXYZ", "a bcde‚fghi¡jklmn¤o¢pqrstu£vwxyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; diff --git a/harbour/source/codepage/cphr437.c b/harbour/source/codepage/cphr437.c index 1322f5e594..19cbb1810e 100644 --- a/harbour/source/codepage/cphr437.c +++ b/harbour/source/codepage/cphr437.c @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ diff --git a/harbour/source/codepage/cphu852s.c b/harbour/source/codepage/cphu852s.c index 933bd428b1..5a762c65f3 100644 --- a/harbour/source/codepage/cphu852s.c +++ b/harbour/source/codepage/cphu852s.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HU852S", diff --git a/harbour/source/codepage/cphuisos.c b/harbour/source/codepage/cphuisos.c index 3b0f508655..58258cd143 100644 --- a/harbour/source/codepage/cphuisos.c +++ b/harbour/source/codepage/cphuisos.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HUISOS", diff --git a/harbour/source/codepage/cphuwins.c b/harbour/source/codepage/cphuwins.c index ec1b63f60b..696e996931 100644 --- a/harbour/source/codepage/cphuwins.c +++ b/harbour/source/codepage/cphuwins.c @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -82,10 +82,10 @@ same excepting the characters case, of course. */ -/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for +/* NOTE: Ž/„ has been added to make it fully compatible with sixhu852.obj for S*ccessWare SIx Driver. - Moreover the extra chars had to be replicated in the alternative - codepages (WIN, ISO) too, to keep the Harbour codepage translation + Moreover the extra chars had to be replicated in the alternative + codepages (WIN, ISO) too, to keep the Harbour codepage translation work. [vszakats] */ static HB_CODEPAGE s_codepage = { "HUWINS", diff --git a/harbour/source/codepage/cptr857.c b/harbour/source/codepage/cptr857.c index 4985868761..ac82b5e740 100644 --- a/harbour/source/codepage/cptr857.c +++ b/harbour/source/codepage/cptr857.c @@ -6,7 +6,7 @@ * Harbour Project source code: * National Collation Support Module ( Turkish -- DOS ) * - * Copyright 2006 Bicahi Esgici + * Copyright 2006 Bicahi Esgici * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -62,13 +62,13 @@ here, accented - are considered. */ #define IS_LATIN 1 /* Should be 1, if the national alphabet is based on Latin */ -#define ACCENTED_EQUAL 0 /* Should be 1, if accented character +#define ACCENTED_EQUAL 0 /* Should be 1, if accented character has the same weight as appropriate unaccented. */ #define ACCENTED_INTERLEAVED 0 /* Should be 1, if accented characters sort after their unaccented counterparts - only if the unaccented versions of all - characters being compared are the same + only if the unaccented versions of all + characters being compared are the same ( interleaving ) */ /* If ACCENTED_EQUAL or ACCENTED_INTERLEAVED is 1, you need to mark the @@ -84,8 +84,8 @@ static HB_CODEPAGE s_codepage = { "TR857", HB_CPID_857,HB_UNITB_857,NUMBER_OF_CHARACTERS, - "A¶BC€DEÒFG¦HI˜×JKLMNOâ™PRSžTUêšVYZ", - "aƒbc‡deˆfg§hiŒjklmno“”prsŸtu–vyz", + "A¶BC€DEÒFG¦HI˜×JKLMNOâ™PRSžTUêšVYZ", + "aƒbc‡deˆfg§hiŒjklmno“”prsŸtu–vyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; HB_CODEPAGE_INIT( TR857 ) diff --git a/harbour/source/codepage/uckoi8.c b/harbour/source/codepage/uckoi8.c index 9920a24205..ed39d1f1e6 100644 --- a/harbour/source/codepage/uckoi8.c +++ b/harbour/source/codepage/uckoi8.c @@ -4,7 +4,7 @@ /* * xHarbour Project source code: - * + * * * Copyright 2003 Przemyslaw Czerpak * www - http://www.xharbour.org diff --git a/harbour/source/codepage/uckoi8u.c b/harbour/source/codepage/uckoi8u.c index 5517e8a731..10e4b11d34 100644 --- a/harbour/source/codepage/uckoi8u.c +++ b/harbour/source/codepage/uckoi8u.c @@ -4,7 +4,7 @@ /* * xHarbour Project source code: - * + * * * Copyright 2004 Pavel Tsarenko * www - http://www.xharbour.org diff --git a/harbour/source/codepage/ucmaz.c b/harbour/source/codepage/ucmaz.c index b590809823..2ab259a2ff 100644 --- a/harbour/source/codepage/ucmaz.c +++ b/harbour/source/codepage/ucmaz.c @@ -4,7 +4,7 @@ /* * xHarbour Project source code: - * + * * * Copyright 2003 Przemyslaw Czerpak * www - http://www.xharbour.org diff --git a/harbour/source/codepage/ucmik.c b/harbour/source/codepage/ucmik.c index 490c1b3f3b..ffbd66fc91 100644 --- a/harbour/source/codepage/ucmik.c +++ b/harbour/source/codepage/ucmik.c @@ -5,7 +5,7 @@ /* * xHarbour Project source code: * Bulgarian MIK <--> Unicode conversion table - * + * * Copyright 2005 Phil Krylov * www - http://www.xharbour.org * diff --git a/harbour/source/common/hbdate.c b/harbour/source/common/hbdate.c index 4c9cecc33c..c9a94439bb 100644 --- a/harbour/source/common/hbdate.c +++ b/harbour/source/common/hbdate.c @@ -83,7 +83,7 @@ # include #elif !defined( HB_OS_WIN ) # include -# if defined(_MSC_VER) +# if defined( _MSC_VER ) # define timeb _timeb # define ftime _ftime # endif @@ -106,7 +106,7 @@ void hb_timeStampGetLocal( int * piYear, int * piMonth, int * piDay, { HB_TRACE(HB_TR_DEBUG, ("hb_timeStampGetLocal(%p,%p,%p,%p,%p,%p,%p)", piYear, piMonth, piDay, piHour, piMinutes, piSeconds, piMSec)); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { SYSTEMTIME st; @@ -159,7 +159,7 @@ HB_ULONG hb_dateMilliSeconds( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateMilliSeconds()")); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { SYSTEMTIME st; GetSystemTime( &st ); diff --git a/harbour/source/common/hbfopen.c b/harbour/source/common/hbfopen.c index 5b2eb3e8cb..45907f7923 100644 --- a/harbour/source/common/hbfopen.c +++ b/harbour/source/common/hbfopen.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * www - http://www.harbour-project.org diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c index 8d425a9b0f..632061f083 100644 --- a/harbour/source/common/hbfsapi.c +++ b/harbour/source/common/hbfsapi.c @@ -301,7 +301,7 @@ BOOL hb_fsNameExists( const char * pszFileName ) #if defined( HB_OS_DOS ) { -#if defined( __DJGPP__ ) || defined(__BORLANDC__) +#if defined( __DJGPP__ ) || defined( __BORLANDC__ ) fExist = _chmod( pszFileName, 0, 0 ) != -1; #else unsigned int iAttr = 0; @@ -352,7 +352,7 @@ BOOL hb_fsFileExists( const char * pszFileName ) #if defined( HB_OS_DOS ) { -#if defined( __DJGPP__ ) || defined(__BORLANDC__) +#if defined( __DJGPP__ ) || defined( __BORLANDC__ ) int iAttr = _chmod( pszFileName, 0, 0 ); fExist = iAttr != -1 && ( iAttr & 0x10 ) == 0; #else @@ -412,7 +412,7 @@ BOOL hb_fsDirExists( const char * pszDirName ) #if defined( HB_OS_DOS ) { -#if defined( __DJGPP__ ) || defined(__BORLANDC__) +#if defined( __DJGPP__ ) || defined( __BORLANDC__ ) int iAttr = _chmod( pszDirName, 0, 0 ); fExist = iAttr != -1 && ( iAttr & 0x10 ) != 0; #else diff --git a/harbour/source/common/hbgete.c b/harbour/source/common/hbgete.c index f54574f5b8..7ddc490d37 100644 --- a/harbour/source/common/hbgete.c +++ b/harbour/source/common/hbgete.c @@ -69,7 +69,7 @@ char * hb_getenv( const char * szName ) { char * pszBuffer = NULL; -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { DWORD size = GetEnvironmentVariableA( szName, NULL, 0 ); @@ -81,7 +81,7 @@ char * hb_getenv( const char * szName ) } } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { PSZ EnvValue = ( PSZ ) ""; @@ -109,11 +109,11 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize ) { BOOL bRetVal; -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) bRetVal = GetEnvironmentVariableA( szName, szBuffer, nSize ) != 0; -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { PSZ EnvValue = ( PSZ ) ""; @@ -152,7 +152,7 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize ) */ BOOL hb_setenv( const char * szName, const char * szValue ) { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) return SetEnvironmentVariableA( szName, szValue ) != 0; diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c index 77d0796a57..9fdcec8708 100644 --- a/harbour/source/common/hbprintf.c +++ b/harbour/source/common/hbprintf.c @@ -104,7 +104,7 @@ optimized. #if defined( __BORLANDC__ ) || defined( __WATCOMC__ ) || defined( _MSC_VER ) # include -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) /* _LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_; */ #elif defined( HB_OS_SUNOS ) # include /* for finite() */ @@ -179,7 +179,7 @@ optimized. #endif -#if defined( __GNUC__ ) && ( defined( _ISOC99_SOURCE ) || defined(__MINGW32__) ) +#if defined( __GNUC__ ) && ( defined( _ISOC99_SOURCE ) || defined( __MINGW32__ ) ) /* use C99 macros */ # define HB_NUMTYPE( v, d ) do { \ @@ -221,9 +221,9 @@ optimized. #elif 0 /* TODO: add other C compilers here (check their version number) */ #else -# if defined(__RSXNT__) || defined(__EMX__) || \ - defined(__XCC__) || defined(__POCC__) || \ - defined(__MINGW32__) || defined(HB_OS_HPUX) +# if defined( __RSXNT__ ) || defined( __EMX__ ) || \ + defined( __XCC__ ) || defined( __POCC__ ) || \ + defined( __MINGW32__ ) || defined( HB_OS_HPUX ) # define hb_isfinite( d ) isfinite( d ) # elif !defined( __NO_LONGDOUBLE__ ) && defined( __BORLANDC__ ) # define hb_isfinite( d ) _finitel( d ) @@ -231,7 +231,7 @@ optimized. # define hb_isfinite( d ) _finite( ( double ) d ) # elif defined( __BORLANDC__ ) || defined( __WATCOMC__ ) # define hb_isfinite( d ) _finite( d ) -# elif defined(__GNUC__) || defined(__DJGPP__) || defined(__LCC__) +# elif defined( __GNUC__ ) || defined( __DJGPP__ ) || defined( __LCC__ ) # define hb_isfinite( d ) finite( d ) # else # define hb_isfinite( d ) FALSE diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index 310891679e..1e37d5a3bf 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -79,7 +79,7 @@ #include "hbapi.h" #include "hbmemory.ch" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) #ifndef VER_PLATFORM_WIN32_WINDOWS #define VER_PLATFORM_WIN32_WINDOWS 1 @@ -88,7 +88,7 @@ #define VER_PLATFORM_WIN32_CE 3 #endif -#elif defined(HB_OS_UNIX) && !defined(__CEGCC__) +#elif defined( HB_OS_UNIX ) && !defined( __CEGCC__ ) #include @@ -170,7 +170,7 @@ char * hb_verPlatform( void ) pszPlatform = ( char * ) hb_xgrab( PLATFORM_BUF_SIZE + 1 ); -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { union REGS regs; @@ -229,7 +229,7 @@ char * hb_verPlatform( void ) } } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { unsigned long aulQSV[ QSV_MAX ] = { 0 }; @@ -254,7 +254,7 @@ char * hb_verPlatform( void ) hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "OS/2" ); } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) { OSVERSIONINFOA osVer; @@ -271,7 +271,7 @@ char * hb_verPlatform( void ) if( hntdll ) { -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) if( GetProcAddress( hntdll, TEXT( "wine_get_version" ) ) ) #else if( GetProcAddress( hntdll, "wine_get_version" ) ) @@ -296,7 +296,7 @@ char * hb_verPlatform( void ) if( osVer.dwMajorVersion == 6 ) { -#if !defined(HB_OS_WIN_CE) && !defined(__DMC__) && (!defined(_MSC_VER) || _MSC_VER >= 1400) +#if !defined( HB_OS_WIN_CE ) && !defined( __DMC__ ) && ( !defined( _MSC_VER ) || _MSC_VER >= 1400 ) OSVERSIONINFOEXA osVerEx; osVerEx.dwOSVersionInfoSize = sizeof( osVerEx ); @@ -371,11 +371,11 @@ char * hb_verPlatform( void ) hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "Windows" ); } -#elif defined(__CEGCC__) +#elif defined( __CEGCC__ ) { hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "Windows CE" ); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) { struct utsname un; @@ -397,7 +397,7 @@ char * hb_verPlatform( void ) BOOL hb_iswinnt( void ) { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) static BOOL s_fWinNT = FALSE; static BOOL s_fInited = FALSE; @@ -417,7 +417,7 @@ BOOL hb_iswinnt( void ) BOOL hb_iswince( void ) { -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) return TRUE; #else return FALSE; @@ -442,9 +442,9 @@ char * hb_verCompiler( void ) pszCompiler = ( char * ) hb_xgrab( COMPILER_BUF_SIZE ); szSub[ 0 ] = '\0'; -#if defined(__IBMC__) || defined(__IBMCPP__) +#if defined( __IBMC__ ) || defined( __IBMCPP__ ) - #if defined(__IBMC__) + #if defined( __IBMC__ ) iVerMajor = __IBMC__; #else iVerMajor = __IBMCPP__; @@ -459,39 +459,39 @@ char * hb_verCompiler( void ) iVerMinor = iVerMajor % 100; iVerPatch = 0; -#elif defined(__POCC__) +#elif defined( __POCC__ ) pszName = "Pelles ISO C Compiler"; iVerMajor = __POCC__ / 100; iVerMinor = __POCC__ % 100; iVerPatch = 0; -#elif defined(__XCC__) +#elif defined( __XCC__ ) pszName = "Pelles ISO C Compiler (XCC)"; iVerMajor = __XCC__ / 100; iVerMinor = __XCC__ % 100; iVerPatch = 0; -#elif defined(__LCC__) +#elif defined( __LCC__ ) pszName = "Logiciels/Informatique lcc-win32"; iVerMajor = 0 /* __LCC__ / 100 */; iVerMinor = 0 /* __LCC__ % 100 */; iVerPatch = 0; -#elif defined(__DMC__) +#elif defined( __DMC__ ) pszName = __DMC_VERSION_STRING__; iVerMajor = 0; iVerMinor = 0; iVerPatch = 0; -#elif defined(__ICL) +#elif defined( __ICL ) pszName = "Intel(R) C"; - #if defined(__cplusplus) + #if defined( __cplusplus ) hb_strncpy( szSub, "++", sizeof( szSub ) - 1 ); #endif @@ -499,11 +499,11 @@ char * hb_verCompiler( void ) iVerMinor = __ICL % 100; iVerPatch = 0; -#elif defined(__ICC) +#elif defined( __ICC ) pszName = "Intel(R) (ICC) C"; - #if defined(__cplusplus) + #if defined( __cplusplus ) hb_strncpy( szSub, "++", sizeof( szSub ) - 1 ); #endif @@ -511,7 +511,7 @@ char * hb_verCompiler( void ) iVerMinor = __ICC % 100; iVerPatch = 0; -#elif defined(_MSC_VER) +#elif defined( _MSC_VER ) #if (_MSC_VER >= 800) pszName = "Microsoft Visual C"; @@ -519,20 +519,20 @@ char * hb_verCompiler( void ) pszName = "Microsoft C"; #endif - #if defined(__cplusplus) + #if defined( __cplusplus ) hb_strncpy( szSub, "++", sizeof( szSub ) - 1 ); #endif iVerMajor = _MSC_VER / 100; iVerMinor = _MSC_VER % 100; - #if defined(_MSC_FULL_VER) + #if defined( _MSC_FULL_VER ) iVerPatch = _MSC_FULL_VER - ( _MSC_VER * 10000 ); #else iVerPatch = 0; #endif -#elif defined(__BORLANDC__) +#elif defined( __BORLANDC__ ) #if (__BORLANDC__ >= 1424) /* Version 5.9 */ pszName = "CodeGear C++"; @@ -553,21 +553,21 @@ char * hb_verCompiler( void ) iVerPatch = 0; #endif -#elif defined(__TURBOC__) +#elif defined( __TURBOC__ ) pszName = "Borland Turbo C"; iVerMajor = __TURBOC__ >> 8; iVerMinor = __TURBOC__ & 0xFF; iVerPatch = 0; -#elif defined(__MPW__) +#elif defined( __MPW__ ) pszName = "MPW C"; iVerMajor = __MPW__ / 100; iVerMinor = __MPW__ % 100; iVerPatch = 0; -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) #if __WATCOMC__ < 1200 pszName = "Watcom C"; @@ -575,7 +575,7 @@ char * hb_verCompiler( void ) pszName = "Open Watcom C"; #endif - #if defined(__cplusplus) + #if defined( __cplusplus ) hb_strncpy( szSub, "++", sizeof( szSub ) - 1 ); #endif @@ -588,31 +588,31 @@ char * hb_verCompiler( void ) iVerPatch = 0; #endif -#elif defined(__GNUC__) +#elif defined( __GNUC__ ) - #if defined(__DJGPP__) + #if defined( __DJGPP__ ) pszName = "Delorie GNU C"; - #elif defined(__CYGWIN__) + #elif defined( __CYGWIN__ ) pszName = "Cygwin GNU C"; - #elif defined(__MINGW32__) + #elif defined( __MINGW32__ ) pszName = "MinGW GNU C"; - #elif defined(__RSX32__) + #elif defined( __RSX32__ ) pszName = "EMX/RSXNT/DOS GNU C"; - #elif defined(__RSXNT__) + #elif defined( __RSXNT__ ) pszName = "EMX/RSXNT/Win32 GNU C"; - #elif defined(__EMX__) + #elif defined( __EMX__ ) pszName = "EMX GNU C"; #else pszName = "GNU C"; #endif - #if defined(__cplusplus) + #if defined( __cplusplus ) hb_strncpy( szSub, "++", sizeof( szSub ) - 1 ); #endif iVerMajor = __GNUC__; iVerMinor = __GNUC_MINOR__; - #if defined(__GNUC_PATCHLEVEL__) + #if defined( __GNUC_PATCHLEVEL__ ) iVerPatch = __GNUC_PATCHLEVEL__; #else iVerPatch = 0; @@ -636,7 +636,7 @@ char * hb_verCompiler( void ) else hb_strncpy( pszCompiler, "(unknown)", COMPILER_BUF_SIZE - 1 ); -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) hb_snprintf( szSub, sizeof( szSub ), " (DJGPP %i.%02i)", ( int ) __DJGPP__, ( int ) __DJGPP_MINOR__ ); hb_strncat( pszCompiler, szSub, COMPILER_BUF_SIZE - 1 ); #endif diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c index 598e89476c..27f585bbf2 100644 --- a/harbour/source/common/hbverdsp.c +++ b/harbour/source/common/hbverdsp.c @@ -148,7 +148,7 @@ void hb_verBuildInfo( void ) #if ! defined( HB_NO_PROFILER ) hb_conOutErr( "(profiler) ", 0 ); #endif -#if defined(__cplusplus) +#if defined( __cplusplus ) hb_conOutErr( "(C++ mode) ", 0 ); #endif hb_conOutErr( hb_conNewLine(), 0 ); diff --git a/harbour/source/common/hbwince.c b/harbour/source/common/hbwince.c index 6a0b72dd0a..e6f60dfc6b 100644 --- a/harbour/source/common/hbwince.c +++ b/harbour/source/common/hbwince.c @@ -63,7 +63,7 @@ #include "hbapi.h" #include "hbdate.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) void hb_mbtowccpy( wchar_t *dstW, const char *srcA, ULONG ulLen ) { @@ -128,7 +128,7 @@ void hb_wctombget( char *dstA, const wchar_t *srcW, unsigned long ulLen ) WideCharToMultiByte( CP_ACP, 0, srcW, ulLen, dstA, ulLen, NULL, NULL ); } -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) int remove( const char *filename ) { @@ -721,7 +721,7 @@ HLOCAL WINAPI LocalHandle( LPCVOID p ) #endif /* !_MSC_VER || __POCC__ || __XCC__ */ -#if defined(__MINGW32CE__) +#if defined( __MINGW32CE__ ) int WINAPI MulDiv( int nNumber, int nNumerator, int nDenominator ) { if( nDenominator ) @@ -775,7 +775,7 @@ BOOL WINAPI FloodFill( HDC h, int x, int y, COLORREF c ) * functions which were overloaded but are not longer necessary */ #if 0 -#if defined(__MINGW32CE__) +#if defined( __MINGW32CE__ ) int access( const char *filename, int mode ) { diff --git a/harbour/source/compiler/compi18n.c b/harbour/source/compiler/compi18n.c index 69c779e35b..b2265e1d28 100644 --- a/harbour/source/compiler/compi18n.c +++ b/harbour/source/compiler/compi18n.c @@ -121,7 +121,7 @@ static PHB_I18NSTRING hb_compI18nAddSingle( HB_COMP_DECL, const char* szText, co if( pI18n->pString ) { pI18n->uiAllocated += 32; - pI18n->pString = ( PHB_I18NSTRING ) hb_xrealloc( pI18n->pString, sizeof( HB_I18NSTRING ) + pI18n->pString = ( PHB_I18NSTRING ) hb_xrealloc( pI18n->pString, sizeof( HB_I18NSTRING ) * pI18n->uiAllocated ); } else @@ -284,7 +284,7 @@ BOOL hb_compI18nSave( HB_COMP_DECL, BOOL fFinal ) char szFileName[ HB_PATH_MAX ]; char* szText; UINT uiIndex, uiLine; - FILE* file; + FILE* file; pI18n = HB_COMP_PARAM->pI18n; if( !pI18n ) diff --git a/harbour/source/compiler/expropta.c b/harbour/source/compiler/expropta.c index bd062e3f85..2de2b9ec18 100644 --- a/harbour/source/compiler/expropta.c +++ b/harbour/source/compiler/expropta.c @@ -3,7 +3,7 @@ */ /* hbexpra.c is also included from ../macro/macro.c - * However it produces a slighty different code if used in + * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) * 1.23 - ignore this magic number - this is used to force compilation */ diff --git a/harbour/source/compiler/exproptb.c b/harbour/source/compiler/exproptb.c index ec613a8318..4698bb5cee 100644 --- a/harbour/source/compiler/exproptb.c +++ b/harbour/source/compiler/exproptb.c @@ -3,7 +3,7 @@ */ /* hbexprb.c is also included from ../macro/macro.c - * However it produces a slighty different code if used in + * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) * 1.20 - ignore this magic number - this is used to force compilation */ diff --git a/harbour/source/compiler/fixflex.c b/harbour/source/compiler/fixflex.c index afd9c9174e..dda0aec835 100644 --- a/harbour/source/compiler/fixflex.c +++ b/harbour/source/compiler/fixflex.c @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ @@ -131,7 +131,7 @@ int main( int argc, char * argv [] ) if( strcmp( argv[ i ], "-P" ) == 0 ) c_plus_plus = 1; if( strcmp( argv[ i ], "-P+" ) == 0 ) c_plus_plus = 1; if( strcmp( argv[ i ], "-P-" ) == 0 ) c_plus_plus = 0; - } + } /* Rename source to backup. */ hb_strncpy( backup, argv[ 1 ], sizeof( backup ) - 1 ); len = strlen( backup ); @@ -327,7 +327,7 @@ int main( int argc, char * argv [] ) if( ferror( replace ) ) { rc = 16; - printf( "\nError %d (DOS error %02xd) writing to %s (after renaming to %s).", + printf( "\nError %d (DOS error %02xd) writing to %s (after renaming to %s).", errno, _doserrno, argv[ 1 ], backup ); } } diff --git a/harbour/source/compiler/gencobj.c b/harbour/source/compiler/gencobj.c index 1883ce2831..9a650c4391 100644 --- a/harbour/source/compiler/gencobj.c +++ b/harbour/source/compiler/gencobj.c @@ -270,16 +270,16 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName ) if( HB_COMP_PARAM->pOutPath->szPath ) pOut->szPath = HB_COMP_PARAM->pOutPath->szPath; -#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) +#if defined( __BORLANDC__ ) || defined( _MSC_VER ) || defined( __WATCOMC__ ) pOut->szExtension = ".obj"; #else pOut->szExtension = ".o"; /* Don't know if we can hardcode it for Un*x */ #endif hb_fsFNameMerge( pszTemp, pOut ); -#if defined(_MSC_VER) +#if defined( _MSC_VER ) hb_strncat( szOutPath, "-Fo", sizeof( szOutPath ) - 1 ); -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) hb_strncat( szOutPath, "-fo=", sizeof( szOutPath ) - 1 ); #else hb_strncat( szOutPath, "-o", sizeof( szOutPath ) - 1 ); diff --git a/harbour/source/compiler/hbgenerr.c b/harbour/source/compiler/hbgenerr.c index ac13a44d3c..82835708be 100644 --- a/harbour/source/compiler/hbgenerr.c +++ b/harbour/source/compiler/hbgenerr.c @@ -100,7 +100,7 @@ const char * hb_comp_szErrors[] = "Can't find %s file", "Invalid ALWAYS after %s in RECOVER code", "File write error", - /* Some historical, funny sounding error messages from original CA-Cl*pper. + /* Some historical, funny sounding error messages from original CA-Cl*pper. They serve no purpose whatsoever. [vszakats] */ "END wreaks terrible vengeance on control stack", "Control level closure leaves gaping wound in control stack", diff --git a/harbour/source/compiler/hbmain.c b/harbour/source/compiler/hbmain.c index 3bef504228..02b5863195 100644 --- a/harbour/source/compiler/hbmain.c +++ b/harbour/source/compiler/hbmain.c @@ -48,8 +48,8 @@ /* * Avoid tracing in preprocessor/compiler. */ -#if ! defined(HB_TRACE_UTILS) - #if defined(HB_TRACE_LEVEL) +#if ! defined( HB_TRACE_UTILS ) + #if defined( HB_TRACE_LEVEL ) #undef HB_TRACE_LEVEL #endif #endif diff --git a/harbour/source/compiler/hbopt.c b/harbour/source/compiler/hbopt.c index cbdc9ce427..9bc70848d3 100644 --- a/harbour/source/compiler/hbopt.c +++ b/harbour/source/compiler/hbopt.c @@ -949,7 +949,7 @@ void hb_compOptimizePCode( HB_COMP_DECL, PFUNCTION pFunc ) #define OPT_LOCAL_FLAG_POPSELF 16 #define OPT_LOCAL_FLAG_CHANGE 32 -typedef struct +typedef struct { SHORT isNumber; BYTE bFlags; @@ -959,7 +959,7 @@ typedef struct static BOOL hb_compIsJump( BYTE bPCode ) { return ( bPCode >= HB_P_JUMPNEAR && bPCode <= HB_P_JUMPTRUEFAR ) || /* All jumps */ - bPCode == HB_P_SEQBEGIN || bPCode == HB_P_SEQEND || + bPCode == HB_P_SEQBEGIN || bPCode == HB_P_SEQEND || bPCode == HB_P_SEQALWAYS || bPCode == HB_P_ALWAYSBEGIN; } @@ -975,8 +975,8 @@ static BOOL hb_compIsUncondJump( BYTE bPCode ) /* static SHORT hb_compIsLocalOp( BYTE bCode ) { - return bCode == HB_P_POPLOCAL || - bCode == HB_P_POPLOCALNEAR || + return bCode == HB_P_POPLOCAL || + bCode == HB_P_POPLOCALNEAR || bCode == HB_P_PUSHLOCAL || bCode == HB_P_PUSHLOCALNEAR || bCode == HB_P_PUSHLOCALREF || @@ -1041,7 +1041,7 @@ static LONG hb_compJumpGetOffset( BYTE * pCode ) static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) { - ULONG ulPos = 0, ulLastPos = 0; + ULONG ulPos = 0, ulLastPos = 0; SHORT isVar = 0; BOOL fWasJump = 0; @@ -1052,8 +1052,8 @@ static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) switch( pFunc->pCode[ ulPos ] ) { - case HB_P_POPLOCALNEAR: - case HB_P_PUSHLOCALNEAR: + case HB_P_POPLOCALNEAR: + case HB_P_PUSHLOCALNEAR: case HB_P_LOCALNEARADDINT: isVar = ( signed char ) pFunc->pCode[ ulPos + 1 ]; break; @@ -1072,16 +1072,16 @@ static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) switch( pFunc->pCode[ ulPos ] ) { - case HB_P_POPLOCALNEAR: + case HB_P_POPLOCALNEAR: case HB_P_POPLOCAL: if( isVar > 0 ) { if( ulPos > 0 && pFunc->pCode[ ulLastPos ] == HB_P_PUSHSELF && ! hb_compHasJump( pFunc, ulPos ) && ! fWasJump ) { - /* For real POPSELF support we need to do backward tree - tracing. This is not implemented, but using fWasJump - we can easy optimize Self := QSelf() at the beginning + /* For real POPSELF support we need to do backward tree + tracing. This is not implemented, but using fWasJump + we can easy optimize Self := QSelf() at the beginning of functions. [Mindaugas] */ pLocals[ isVar - 1 ].bFlags |= OPT_LOCAL_FLAG_POPSELF; @@ -1091,7 +1091,7 @@ static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) } break; - case HB_P_PUSHLOCALNEAR: + case HB_P_PUSHLOCALNEAR: case HB_P_PUSHLOCAL: if( isVar > 0 ) pLocals[ isVar - 1 ].bFlags |= OPT_LOCAL_FLAG_PUSH; @@ -1166,7 +1166,7 @@ static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) break; case HB_P_PUSHBLOCK: - case HB_P_PUSHBLOCKLARGE: + case HB_P_PUSHBLOCKLARGE: { BYTE * pCode = &pFunc->pCode[ ulPos + 5 ]; USHORT usVarCount, usVar; @@ -1179,14 +1179,14 @@ static void hb_compPCodeEnumScanLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLocals ) { pCode += 2; usVar = HB_PCODE_MKUSHORT( pCode ); - if( usVar > 0 ) + if( usVar > 0 ) pLocals[ usVar - 1 ].bFlags |= OPT_LOCAL_FLAG_BLOCK; } break; } /* local name is not a big usage... - case HB_P_LOCALNAME: + case HB_P_LOCALNAME: */ } ulLastPos = ulPos; @@ -1203,7 +1203,7 @@ static void hb_compPCodeEnumSelfifyLocal( PFUNCTION pFunc, SHORT isLocal ) { switch( pFunc->pCode[ ulPos ] ) { - case HB_P_PUSHLOCALNEAR: + case HB_P_PUSHLOCALNEAR: if( isLocal == ( signed char ) pFunc->pCode[ ulPos + 1 ] ) { pFunc->pCode[ ulPos ] = HB_P_PUSHSELF; @@ -1256,8 +1256,8 @@ static int hb_compPCodeTraceAssignedUnused( PFUNCTION pFunc, ULONG ulPos, BYTE * pMap[ ulPos ] = 1; - if( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || - pFunc->pCode[ ulPos ] == HB_P_POPLOCALNEAR || + if( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || + pFunc->pCode[ ulPos ] == HB_P_POPLOCALNEAR || pFunc->pCode[ ulPos ] == HB_P_PUSHLOCAL || pFunc->pCode[ ulPos ] == HB_P_PUSHLOCALNEAR || pFunc->pCode[ ulPos ] == HB_P_PUSHLOCALREF || @@ -1268,9 +1268,9 @@ static int hb_compPCodeTraceAssignedUnused( PFUNCTION pFunc, ULONG ulPos, BYTE * pFunc->pCode[ ulPos ] == HB_P_LOCALNEARADDINT ) { - if( hb_compLocalGetNumber( pFunc->pCode + ulPos ) == isLocal ) + if( hb_compLocalGetNumber( pFunc->pCode + ulPos ) == isLocal ) { - if( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || + if( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || pFunc->pCode[ ulPos ] == HB_P_POPLOCALNEAR ) return 0; else @@ -1278,9 +1278,9 @@ static int hb_compPCodeTraceAssignedUnused( PFUNCTION pFunc, ULONG ulPos, BYTE * } } - /* The following part of the function is standard for all recursive pcode - tracing, except recursive function calls are hardcoded. We can implement - universal recursive tracer by putting all parameters into "cargo" + /* The following part of the function is standard for all recursive pcode + tracing, except recursive function calls are hardcoded. We can implement + universal recursive tracer by putting all parameters into "cargo" structure. [Mindaugas] */ if( hb_compIsJump( pFunc->pCode[ ulPos ] ) ) @@ -1335,7 +1335,7 @@ static void hb_compPCodeEnumAssignedUnused( HB_COMP_DECL, PFUNCTION pFunc, PHB_O BOOL fCheck; /* skip pop NIL (var := NIL), to allow force garbage collection */ - fCheck = ( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || + fCheck = ( pFunc->pCode[ ulPos ] == HB_P_POPLOCAL || pFunc->pCode[ ulPos ] == HB_P_POPLOCALNEAR ) && ! ( ulPos > 0 && pFunc->pCode[ ulLastPos ] == HB_P_PUSHNIL ); @@ -1404,24 +1404,24 @@ static void hb_compPCodeEnumAssignedUnused( HB_COMP_DECL, PFUNCTION pFunc, PHB_O for( is = 1; is < isLocal; is++ ) pVar = pVar->pNext; - assert( pLocals[ isLocal - 1 ].bFlags != 0 ); + assert( pLocals[ isLocal - 1 ].bFlags != 0 ); /* Skip detachables, referenced, optimizable self */ - if( ( pLocals[ isLocal - 1 ].bFlags & ( OPT_LOCAL_FLAG_BLOCK | OPT_LOCAL_FLAG_PUSHREF ) ) == 0 && - pLocals[ isLocal - 1 ].bFlags != OPT_LOCAL_FLAG_POPSELF && + if( ( pLocals[ isLocal - 1 ].bFlags & ( OPT_LOCAL_FLAG_BLOCK | OPT_LOCAL_FLAG_PUSHREF ) ) == 0 && + pLocals[ isLocal - 1 ].bFlags != OPT_LOCAL_FLAG_POPSELF && pLocals[ isLocal - 1 ].bFlags != ( OPT_LOCAL_FLAG_PUSH | OPT_LOCAL_FLAG_POPSELF ) ) { memset( pMap, 0, pFunc->lPCodePos ); pMap[ ulPos ] = 1; - if( ! hb_compPCodeTraceAssignedUnused( pFunc, ulPos + hb_compPCodeSize( pFunc, ulPos ), + if( ! hb_compPCodeTraceAssignedUnused( pFunc, ulPos + hb_compPCodeSize( pFunc, ulPos ), pMap, isLocal ) ) { char szFun[ 256 ]; - /* TOFIX: We calculate line number by simple tracking last HB_P_LINE, - but it can work bad, if line number optimizator is clever enough. - To obtain real line number we need one more tree scan or other + /* TOFIX: We calculate line number by simple tracking last HB_P_LINE, + but it can work bad, if line number optimizator is clever enough. + To obtain real line number we need one more tree scan or other algorithm. [Mindaugas] */ hb_snprintf( szFun, sizeof( szFun ), "%s(%i)", pFunc->szName, usLine ); @@ -1448,8 +1448,8 @@ static void hb_compPCodeEnumRenumberLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLoca { switch( pFunc->pCode[ ulPos ] ) { - case HB_P_POPLOCALNEAR: - case HB_P_PUSHLOCALNEAR: + case HB_P_POPLOCALNEAR: + case HB_P_PUSHLOCALNEAR: case HB_P_LOCALNEARADDINT: { BYTE * pVar = &pFunc->pCode[ ulPos + 1 ]; @@ -1500,7 +1500,7 @@ static void hb_compPCodeEnumRenumberLocals( PFUNCTION pFunc, PHB_OPT_LOCAL pLoca } case HB_P_PUSHBLOCK: - case HB_P_PUSHBLOCKLARGE: + case HB_P_PUSHBLOCKLARGE: { BYTE * pVar = &pFunc->pCode[ ulPos + 5 ]; USHORT usVarCount, isVar; @@ -1541,7 +1541,7 @@ void hb_compPCodeTraceOptimizer( HB_COMP_DECL ) BOOL fBool; /* Many (perhaps ALL) functions of pcode trace optimization dependes on pcodes. - Please, check these functions if new pcode is added, or existing changed. + Please, check these functions if new pcode is added, or existing changed. Special attention should be paid, if new pcode introduces branching, codeblocks, or are related to parameters, local variables. [Mindaugas] */ @@ -1594,7 +1594,7 @@ void hb_compPCodeTraceOptimizer( HB_COMP_DECL ) * [druzus] */ #if 0 - assert( ( ! ( pVar->iUsed & VU_USED ) && pLocals[ usIndex ].bFlags == 0 ) || + assert( ( ! ( pVar->iUsed & VU_USED ) && pLocals[ usIndex ].bFlags == 0 ) || ( ( pVar->iUsed & VU_USED ) && pLocals[ usIndex ].bFlags != 0 ) ); #endif @@ -1619,8 +1619,8 @@ void hb_compPCodeTraceOptimizer( HB_COMP_DECL ) for( usIndex = pFunc->wParamCount; usIndex < usLocalCount; usIndex++ ) { - if( pLocals[ usIndex ].bFlags == ( OPT_LOCAL_FLAG_PUSH | OPT_LOCAL_FLAG_POPSELF ) || - pLocals[ usIndex ].bFlags == OPT_LOCAL_FLAG_POPSELF ) + if( pLocals[ usIndex ].bFlags == ( OPT_LOCAL_FLAG_PUSH | OPT_LOCAL_FLAG_POPSELF ) || + pLocals[ usIndex ].bFlags == OPT_LOCAL_FLAG_POPSELF ) { /* printf( "Info: %s(%d) selfifying variable '%s'\n", pFunc->szName, pVar->iDeclLine, pVar->szName ); */ hb_compPCodeEnumSelfifyLocal( pFunc, usIndex + 1 ); diff --git a/harbour/source/debug/dbgmenu.prg b/harbour/source/debug/dbgmenu.prg index fc64142a6f..3da245cbb2 100644 --- a/harbour/source/debug/dbgmenu.prg +++ b/harbour/source/debug/dbgmenu.prg @@ -129,21 +129,21 @@ FUNCTION __dbgBuildMenu( oDebugger ) // Builds the debugger pulldown menu MENUITEM " pri~Vate " IDENT "PRIVATE" ; ACTION oDebugger:Private() ; CHECKED oDebugger:lShowPrivates - + MENUITEM " ~Static" IDENT "STATIC" ; ACTION oDebugger:Static() ; CHECKED oDebugger:lShowStatics - + MENUITEM " ~Local" IDENT "LOCAL" ; ACTION oDebugger:Local() ; CHECKED oDebugger:lShowLocals - + MENUITEM " ~Global" IDENT "GLOBAL" ; ACTION oDebugger:Global() ; CHECKED oDebugger:lShowGlobals SEPARATOR - + MENUITEM " ~All" IDENT "ALL" ; ACTION oDebugger:All() ; CHECKED oDebugger:lAll diff --git a/harbour/source/debug/dbgthsh.prg b/harbour/source/debug/dbgthsh.prg index 42a105d78e..334d9a15e4 100644 --- a/harbour/source/debug/dbgthsh.prg +++ b/harbour/source/debug/dbgthsh.prg @@ -83,7 +83,7 @@ METHOD New( hHash, cVarName, lEditable ) CLASS HBDbHash ::hashName := cVarName ::TheHash := hHash ::lEditable := lEditable - + ::addWindows( ::TheHash ) RETURN Self @@ -155,7 +155,7 @@ METHOD addWindows( hHash, nRow ) CLASS HBDbHash ::aWindows[ ::nCurWindow ],::hashName, hHash ) } SetCursor( SC_NONE ) - + ::aWindows[ ::nCurWindow ]:ShowModal() RETURN Self @@ -298,5 +298,5 @@ STATIC FUNCTION HashKeyString( hHash, nAt ) CASE cType == "D" ; RETURN '"' + DToC( xVal ) + '"' CASE cType == "N" ; RETURN hb_NToS( xVal ) ENDCASE - + RETURN AllTrim( __dbgCStr( xVal ) ) diff --git a/harbour/source/debug/dbgtmenu.prg b/harbour/source/debug/dbgtmenu.prg index 9256bc76e2..418f9c8ca2 100644 --- a/harbour/source/debug/dbgtmenu.prg +++ b/harbour/source/debug/dbgtmenu.prg @@ -278,10 +278,10 @@ METHOD GetItemOrdByCoors( nRow, nCol ) CLASS HBDbMenu RETURN 0 METHOD GetItemByIdent( uIdent ) CLASS HBDbMenu - + LOCAL n LOCAL oItem - + FOR n := 1 TO Len( ::aItems ) IF ISOBJECT( ::aItems[ n ]:bAction ) oItem := ::aItems[ n ]:bAction:GetItemByIdent( uIdent ) diff --git a/harbour/source/debug/dbgtwin.prg b/harbour/source/debug/dbgtwin.prg index 037b7e0cb1..9c14b143e5 100644 --- a/harbour/source/debug/dbgtwin.prg +++ b/harbour/source/debug/dbgtwin.prg @@ -135,7 +135,7 @@ METHOD New( nTop, nLeft, nBottom, nRight, cCaption, cColor ) CLASS HBDbWindow RETURN Self METHOD Clear() CLASS HBDbWindow - + SetColor( ::cColor ) Scroll( ::nTop + 1, ::nLeft + 1, ::nBottom - 1, ::nRight - 1 ) diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg index df701b0dd5..ad9ec44f23 100644 --- a/harbour/source/debug/dbgwa.prg +++ b/harbour/source/debug/dbgwa.prg @@ -160,7 +160,7 @@ PROCEDURE __dbgShowWorkAreas() /* Show dialog */ oDlg:ShowModal() - + dbSelectArea( nOldArea ) RETURN diff --git a/harbour/source/lang/msgcs852.c b/harbour/source/lang/msgcs852.c index 5201d36ec4..f50e3e4c06 100644 --- a/harbour/source/lang/msgcs852.c +++ b/harbour/source/lang/msgcs852.c @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CS852 ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_CS852 ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CS852 +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_CS852 #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CS852 = hb_lang_Init_CS852; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_CS852 = hb_lang_Init_CS852; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgcsiso.c b/harbour/source/lang/msgcsiso.c index ab340127e2..7adfadca49 100644 --- a/harbour/source/lang/msgcsiso.c +++ b/harbour/source/lang/msgcsiso.c @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSISO ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_CSISO ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSISO +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_CSISO #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSISO = hb_lang_Init_CSISO; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSISO = hb_lang_Init_CSISO; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgcskam.c b/harbour/source/lang/msgcskam.c index bd98a26e93..0fa194521a 100644 --- a/harbour/source/lang/msgcskam.c +++ b/harbour/source/lang/msgcskam.c @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSKAM ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_CSKAM ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSKAM +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_CSKAM #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSKAM = hb_lang_Init_CSKAM; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSKAM = hb_lang_Init_CSKAM; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgcswin.c b/harbour/source/lang/msgcswin.c index 98dcea79be..13b84111ea 100644 --- a/harbour/source/lang/msgcswin.c +++ b/harbour/source/lang/msgcswin.c @@ -207,13 +207,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_CSWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_CSWIN ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_CSWIN +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_CSWIN #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSWIN = hb_lang_Init_CSWIN; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_CSWIN = hb_lang_Init_CSWIN; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msgde.c b/harbour/source/lang/msgde.c index 75db3bd233..ecab2b4990 100644 --- a/harbour/source/lang/msgde.c +++ b/harbour/source/lang/msgde.c @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_DE ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_DE ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_DE +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_DE #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_DE = hb_lang_Init_DE; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_DE = hb_lang_Init_DE; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgdewin.c b/harbour/source/lang/msgdewin.c index 22d05532a9..d80768dfd5 100644 --- a/harbour/source/lang/msgdewin.c +++ b/harbour/source/lang/msgdewin.c @@ -207,14 +207,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_DEWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_DEWIN ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_DEWIN +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_DEWIN #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_DEWIN = hb_lang_Init_DEWIN; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_DEWIN = hb_lang_Init_DEWIN; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgel.c b/harbour/source/lang/msgel.c index ae1f321119..9392172148 100644 --- a/harbour/source/lang/msgel.c +++ b/harbour/source/lang/msgel.c @@ -206,13 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_EL ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_EL ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_EL +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_EL #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_EL = hb_lang_Init_EL; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_EL = hb_lang_Init_EL; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msgelwin.c b/harbour/source/lang/msgelwin.c index 23e5def2aa..70a185b6e2 100644 --- a/harbour/source/lang/msgelwin.c +++ b/harbour/source/lang/msgelwin.c @@ -206,13 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ELWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_ELWIN ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ELWIN +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_ELWIN #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ELWIN = hb_lang_Init_ELWIN; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_ELWIN = hb_lang_Init_ELWIN; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msges.c b/harbour/source/lang/msges.c index 30cb8bb3fa..0075b70d31 100644 --- a/harbour/source/lang/msges.c +++ b/harbour/source/lang/msges.c @@ -206,14 +206,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ES ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_ES ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ES +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_ES #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ES = hb_lang_Init_ES; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_ES = hb_lang_Init_ES; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msgeswin.c b/harbour/source/lang/msgeswin.c index 79396b3ecc..07206779d5 100644 --- a/harbour/source/lang/msgeswin.c +++ b/harbour/source/lang/msgeswin.c @@ -207,13 +207,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_ESWIN ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_ESWIN ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_ESWIN +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_ESWIN #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ESWIN = hb_lang_Init_ESWIN; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_ESWIN = hb_lang_Init_ESWIN; #pragma data_seg() -#endif +#endif diff --git a/harbour/source/lang/msggl.c b/harbour/source/lang/msggl.c index ab481bced3..d235af659f 100644 --- a/harbour/source/lang/msggl.c +++ b/harbour/source/lang/msggl.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_GL ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_GL = hb_lang_Init_GL; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msghr437.c b/harbour/source/lang/msghr437.c index 20cffa9694..0b62772af1 100644 --- a/harbour/source/lang/msghr437.c +++ b/harbour/source/lang/msghr437.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_HR437 ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_HR437 = hb_lang_Init_HR437; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msghr852.c b/harbour/source/lang/msghr852.c index 01d964f155..6d6e0a1f1f 100644 --- a/harbour/source/lang/msghr852.c +++ b/harbour/source/lang/msghr852.c @@ -207,14 +207,13 @@ HB_CALL_ON_STARTUP_BEGIN( hb_lang_Init_HR852 ) hb_langRegister( &s_lang ); HB_CALL_ON_STARTUP_END( hb_lang_Init_HR852 ) -#if defined( HB_PRAGMA_STARTUP ) - #pragma startup hb_lang_Init_HR852 +#if defined( HB_PRAGMA_STARTUP ) + #pragma startup hb_lang_Init_HR852 #elif defined( HB_MSC_STARTUP ) #if defined( HB_OS_WIN_64 ) #pragma section( HB_MSC_START_SEGMENT, long, read ) - #endif + #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_HR852 = hb_lang_Init_HR852; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_HR852 = hb_lang_Init_HR852; #pragma data_seg() -#endif - +#endif diff --git a/harbour/source/lang/msghriso.c b/harbour/source/lang/msghriso.c index 64ffbf20a3..2a3f050abe 100644 --- a/harbour/source/lang/msghriso.c +++ b/harbour/source/lang/msghriso.c @@ -217,4 +217,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_HRISO ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_HRISO = hb_lang_Init_HRISO; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgid.c b/harbour/source/lang/msgid.c index ff2f2ab48c..114503dc3e 100644 --- a/harbour/source/lang/msgid.c +++ b/harbour/source/lang/msgid.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_ID ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_ID = hb_lang_Init_ID; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgpliso.c b/harbour/source/lang/msgpliso.c index dc50c7bd7b..0bb94f352f 100644 --- a/harbour/source/lang/msgpliso.c +++ b/harbour/source/lang/msgpliso.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_PLISO ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLISO = hb_lang_Init_PLISO; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgplmaz.c b/harbour/source/lang/msgplmaz.c index e1748648bd..ee464e46b7 100644 --- a/harbour/source/lang/msgplmaz.c +++ b/harbour/source/lang/msgplmaz.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_PLMAZ ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLMAZ = hb_lang_Init_PLMAZ; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgplwin.c b/harbour/source/lang/msgplwin.c index b7626969ef..b3206fc4a9 100644 --- a/harbour/source/lang/msgplwin.c +++ b/harbour/source/lang/msgplwin.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_PLWIN ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_PLWIN = hb_lang_Init_PLWIN; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgro.c b/harbour/source/lang/msgro.c index 492c2d0457..539e605d69 100644 --- a/harbour/source/lang/msgro.c +++ b/harbour/source/lang/msgro.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_RO ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_RO = hb_lang_Init_RO; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgru866.c b/harbour/source/lang/msgru866.c index 7538e65af5..2b5265e71e 100644 --- a/harbour/source/lang/msgru866.c +++ b/harbour/source/lang/msgru866.c @@ -217,4 +217,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_RU866 ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_RU866 = hb_lang_Init_RU866; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgrukoi.c b/harbour/source/lang/msgrukoi.c index 20e98b74df..4663667dd0 100644 --- a/harbour/source/lang/msgrukoi.c +++ b/harbour/source/lang/msgrukoi.c @@ -216,4 +216,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_RUKOI8 ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_RUKOI8 = hb_lang_Init_RUKOI8; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgruwin.c b/harbour/source/lang/msgruwin.c index 5132b8bb44..b4180cd56c 100644 --- a/harbour/source/lang/msgruwin.c +++ b/harbour/source/lang/msgruwin.c @@ -217,4 +217,3 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_RUWIN ) static HB_$INITSYM hb_vm_auto_hb_lang_Init_RUWIN = hb_lang_Init_RUWIN; #pragma data_seg() #endif - diff --git a/harbour/source/lang/msgzhgb.c b/harbour/source/lang/msgzhgb.c index 1a638e8cbd..98697acd3d 100644 --- a/harbour/source/lang/msgzhgb.c +++ b/harbour/source/lang/msgzhgb.c @@ -214,6 +214,6 @@ HB_CALL_ON_STARTUP_END( hb_lang_Init_ZHGB ) #pragma section( HB_MSC_START_SEGMENT, long, read ) #endif #pragma data_seg( HB_MSC_START_SEGMENT ) - static HB_$INITSYM hb_vm_auto_hb_lang_Init_ZHGB = hb_lang_Init_ZHGB; + static HB_$INITSYM hb_vm_auto_hb_lang_Init_ZHGB = hb_lang_Init_ZHGB; #pragma data_seg() #endif diff --git a/harbour/source/macro/macroa.c b/harbour/source/macro/macroa.c index 8c85c4cad8..0e68acbad4 100644 --- a/harbour/source/macro/macroa.c +++ b/harbour/source/macro/macroa.c @@ -3,7 +3,7 @@ */ /* hbexpra.c is also included from ../compiler/expropta.c - * However it produces a slighty different code if used in + * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) * 1.21 - ignore this magic number - this is used to force compilation */ diff --git a/harbour/source/macro/macrob.c b/harbour/source/macro/macrob.c index 073052f318..ce366b5f4c 100644 --- a/harbour/source/macro/macrob.c +++ b/harbour/source/macro/macrob.c @@ -3,7 +3,7 @@ */ /* hbexprb.c is also included from ../compiler/exproptb.c - * However it produces a slighty different code if used in + * However it produces a slighty different code if used in * macro compiler (there is an additional parameter passed to some functions) * 1.18 - ignore this magic number - this is used to force compilation */ diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c index c06d189276..aeeb088ffe 100644 --- a/harbour/source/pp/hbpp.c +++ b/harbour/source/pp/hbpp.c @@ -287,7 +287,7 @@ static int hb_pp_preprocesfile( PHB_PP_STATE pState, const char * szRuleFile ) foutr = hb_fopen( szRuleFile, "w" ); if( !foutr ) { -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) perror( szRuleFile ); #endif iResult = 1; @@ -346,7 +346,7 @@ static int hb_pp_generateVerInfo( char * szVerFile, int iSVNID, char * szChangeL fout = hb_fopen( szVerFile, "w" ); if( !fout ) { -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) perror( szVerFile ); #endif iResult = 1; @@ -458,7 +458,7 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName, { if( iQuiet < 2 ) { -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) perror( pszFile ); #else fprintf( stderr, "Cannot open the %s file.\n", pszFile ); diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index aca836cb17..22dc07fc5d 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -7594,7 +7594,7 @@ static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderI break; case 'C': uiLen = ( USHORT ) hb_itemGetCLen( pResult ); -#if !(defined(HB_COMPAT_C53) && defined(HB_C52_STRICT)) +#if !( defined( HB_COMPAT_C53 ) && defined( HB_C52_STRICT ) ) if( uiLen > CDX_MAXKEY ) uiLen = CDX_MAXKEY; #endif @@ -7613,7 +7613,7 @@ static HB_ERRCODE hb_cdxOrderCreate( CDXAREAP pArea, LPDBORDERCREATEINFO pOrderI hb_cdxErrorRT( pArea, bType == 'U' ? EG_DATATYPE : EG_DATAWIDTH, EDBF_INVALIDKEY, NULL, 0, 0, NULL ); return HB_FAILURE; } -#if defined(HB_COMPAT_C53) && defined(HB_C52_STRICT) +#if defined( HB_COMPAT_C53 ) && defined( HB_C52_STRICT ) else if( bType == 'C' && uiLen > CDX_MAXKEY ) { if( hb_cdxErrorRT( pArea, EG_DATAWIDTH, EDBF_INVALIDKEY, NULL, 0, EF_CANDEFAULT, NULL ) == E_DEFAULT ) diff --git a/harbour/source/rdd/dbfuncs.prg b/harbour/source/rdd/dbfuncs.prg index f94656bbc3..c9345f7a10 100644 --- a/harbour/source/rdd/dbfuncs.prg +++ b/harbour/source/rdd/dbfuncs.prg @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * DataBase Function Mapped to 10 Characters length + * DataBase Function Mapped to 10 Characters length * * Copyright 2001 Luiz Rafael Culik * www - http://www.harbour-project.org @@ -97,8 +97,8 @@ FUNCTION __dbCopySt( cFileName, aFieldList ) FUNCTION __dbCopyXS( cFileName ) RETURN __dbCopyXStruct( cFileName ) -/* ; NOTE: The created table will be kept open if lOpenMode parameter - is of logical type. If .T. it will be opened in a new workarea, +/* ; NOTE: The created table will be kept open if lOpenMode parameter + is of logical type. If .T. it will be opened in a new workarea, if .F. it will be opened in the current one. */ /* ; NOTE: Has an identical parameter list with dbCreate() */ diff --git a/harbour/source/rdd/dbjoin.prg b/harbour/source/rdd/dbjoin.prg index 83d7043b82..e3656babd9 100644 --- a/harbour/source/rdd/dbjoin.prg +++ b/harbour/source/rdd/dbjoin.prg @@ -52,7 +52,7 @@ #include "dbstruct.ch" -/* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters +/* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters (cRDD, nConnection, cCodePage). */ FUNCTION __dbJoin( cAlias, cFile, aFields, bFor, cRDD, nConnection, cCodePage ) @@ -69,13 +69,13 @@ FUNCTION __dbJoin( cAlias, cFile, aFields, bFor, cRDD, nConnection, cCodePage ) IF Empty( aStruct := __FieldTwo( cAlias, aFields ) ) RETURN .F. ENDIF - + BEGIN SEQUENCE dbCreate( cFile, aStruct, cRDD, .T., "", NIL, cCodePage, nConnection ) nResult := Select() aJoinList := __JoinList( nMaster, nDetail, nResult, aStruct ) - + dbSelectArea( nMaster ) dbGoTop() DO WHILE !Eof() @@ -100,7 +100,7 @@ FUNCTION __dbJoin( cAlias, cFile, aFields, bFor, cRDD, nConnection, cCodePage ) RECOVER USING oError lError := .T. END SEQUENCE - + IF nResult != NIL dbSelectArea( nResult ) dbCloseArea() @@ -158,7 +158,7 @@ STATIC FUNCTION __JoinList( nMaster, nDetail, nResult, aStruct ) STATIC PROCEDURE __doJoinList( aList ) LOCAL aJoin - + IF Len( aList ) > 0 ( aList[ 1 ][ 1 ] )->( dbAppend() ) diff --git a/harbour/source/rdd/dbnubs.c b/harbour/source/rdd/dbnubs.c index d445043ba8..7715953f5a 100644 --- a/harbour/source/rdd/dbnubs.c +++ b/harbour/source/rdd/dbnubs.c @@ -118,7 +118,7 @@ HB_FUNC( __DBRECALL ) HB_FUNC_EXEC( DBRECALL ); } -/* NOTE: Clipper does exactly that, __dbCommit() will call dbCommitAll() +/* NOTE: Clipper does exactly that, __dbCommit() will call dbCommitAll() This may be a bug. */ HB_FUNC( __DBCOMMIT ) @@ -202,4 +202,3 @@ HB_FUNC( __DBSELECT ) } #endif - diff --git a/harbour/source/rdd/dbsort.prg b/harbour/source/rdd/dbsort.prg index 0f25de7e90..37a19dfe57 100644 --- a/harbour/source/rdd/dbsort.prg +++ b/harbour/source/rdd/dbsort.prg @@ -50,7 +50,7 @@ * */ -/* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters +/* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters (cRDD, nConnection, cCodePage). */ FUNCTION __dbSort( cToFileName, aFields, bFor, bWhile, nNext, nRecord, lRest,; diff --git a/harbour/source/rdd/dbstrux.prg b/harbour/source/rdd/dbstrux.prg index 39cbee8ac4..1dd05ea512 100644 --- a/harbour/source/rdd/dbstrux.prg +++ b/harbour/source/rdd/dbstrux.prg @@ -99,7 +99,7 @@ FUNCTION __dbCopyXStruct( cFileName ) RETURN .T. -/* NOTE: Compared to CA-Cl*pper, Harbour has two extra parameters +/* NOTE: Compared to CA-Cl*pper, Harbour has two extra parameters (cCodePage, nConnection). */ FUNCTION __dbCreate( cFileName, cFileFrom, cRDD, lNew, cAlias, cCodePage, nConnection ) @@ -140,7 +140,7 @@ FUNCTION __dbCreate( cFileName, cFileFrom, cRDD, lNew, cAlias, cCodePage, nConne dbSelectArea( nOldArea ) ENDIF - /* Type detection is more in sync with dbCreate() logic in Harbour, as lowercase "C" + /* Type detection is more in sync with dbCreate() logic in Harbour, as lowercase "C" and padded/continued strings ("C ", "C...") are also accepted. */ AEval( aStruct, {| aField | iif( Upper( Left( aField[ DBS_TYPE ], 1 ) ) == "C" .AND. aField[ DBS_DEC ] != 0,; diff --git a/harbour/source/rdd/dbtotal.prg b/harbour/source/rdd/dbtotal.prg index 7aba4ff4af..d80b26e9b5 100644 --- a/harbour/source/rdd/dbtotal.prg +++ b/harbour/source/rdd/dbtotal.prg @@ -55,10 +55,10 @@ #include "error.ch" /* NOTE: Compared to CA-Cl*pper, Harbour: - - will accept character expressions for xKey, xFor and xWhile. + - will accept character expressions for xKey, xFor and xWhile. - has three extra parameters (cRDD, nConnection, cCodePage). - will default to active index key for xKey parameter. - - won't crash with "No exported method: EVAL" if xKey is not + - won't crash with "No exported method: EVAL" if xKey is not block and table is not indexed. */ FUNCTION __dbTotal( cFile, xKey, aFields,; diff --git a/harbour/source/rdd/hbsix/sxcompr.c b/harbour/source/rdd/hbsix/sxcompr.c index e312be1616..d69fc1ecd8 100644 --- a/harbour/source/rdd/hbsix/sxcompr.c +++ b/harbour/source/rdd/hbsix/sxcompr.c @@ -210,7 +210,7 @@ static void hb_LZSSxExit( PHB_LZSSX_COMPR pCompr ) hb_xfree( pCompr ); } -static PHB_LZSSX_COMPR hb_LZSSxInit( +static PHB_LZSSX_COMPR hb_LZSSxInit( HB_FHANDLE hInput, BYTE * pSrcBuf, ULONG ulSrcBuf, HB_FHANDLE hOutput, BYTE * pDstBuf, ULONG ulDstBuf ) { diff --git a/harbour/source/rtl/adir.prg b/harbour/source/rtl/adir.prg index 814816206e..a4037307d9 100644 --- a/harbour/source/rtl/adir.prg +++ b/harbour/source/rtl/adir.prg @@ -132,4 +132,3 @@ FUNCTION ADir( cFileMask, aName, aSize, aDate, aTime, aAttr ) NEXT RETURN nDirLen - diff --git a/harbour/source/rtl/altd.prg b/harbour/source/rtl/altd.prg index a8b9b9d7c2..56165b2498 100644 --- a/harbour/source/rtl/altd.prg +++ b/harbour/source/rtl/altd.prg @@ -64,7 +64,7 @@ PROCEDURE AltD( nAction ) /* do not activate the debugger imediatelly because the module where ALTD() was called can have no debugger info - stop - on first LINE with debugged info + on first LINE with debugged info */ __dbgINVOKEDEBUG( Set( _SET_DEBUG ) ) diff --git a/harbour/source/rtl/ampm.c b/harbour/source/rtl/ampm.c index dc1b9fbed6..52b7f5e208 100644 --- a/harbour/source/rtl/ampm.c +++ b/harbour/source/rtl/ampm.c @@ -96,4 +96,3 @@ HB_FUNC( AMPM ) hb_retclen_buffer( pszResult, ulTimeLen + 3 ); } - diff --git a/harbour/source/rtl/checkbox.prg b/harbour/source/rtl/checkbox.prg index 8ea76db5cc..ed7380bf52 100644 --- a/harbour/source/rtl/checkbox.prg +++ b/harbour/source/rtl/checkbox.prg @@ -57,11 +57,11 @@ #include "common.ch" #include "setcurs.ch" -/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but +/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ -/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() - functions to generate screen output. Harbour uses Disp*() +/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() + functions to generate screen output. Harbour uses Disp*() functions only. [vszakats] */ #ifdef HB_COMPAT_C53 @@ -171,9 +171,9 @@ METHOD hitTest( nMRow, nMCol ) CLASS CHECKBOX nMCol < ::nCol + 3 RETURN HTCLIENT ENDIF - + nLenCaption := Len( ::cCaption ) - + IF ( nPosAccel := At( "&", ::cCaption ) ) > 0 .AND. ; nPosAccel < nLenCaption nLenCaption-- @@ -282,7 +282,7 @@ METHOD colorSpec( cColorSpec ) CLASS CHECKBOX RETURN ::cColorSpec METHOD fBlock( bFBlock ) CLASS CHECKBOX - + IF PCount() > 0 ::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) ) ENDIF @@ -309,7 +309,7 @@ METHOD row( nRow ) CLASS CHECKBOX RETURN ::nRow METHOD sBlock( bSBlock ) CLASS CHECKBOX - + IF PCount() > 0 ::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) ) ENDIF @@ -353,7 +353,7 @@ METHOD New( nRow, nCol, cCaption ) CLASS CHECKBOX FUNCTION _CHECKBOX_( lState, cCaption, cMessage, cColorSpec, bFBlock, bSBlock, cStyle, aBitmaps ) LOCAL o := HBCheckBox():New( Row(), Col(), cCaption ) - + o:select( lState ) o:caption := cCaption o:message := cMessage diff --git a/harbour/source/rtl/color53.prg b/harbour/source/rtl/color53.prg index c08bc90de8..3b00b67456 100644 --- a/harbour/source/rtl/color53.prg +++ b/harbour/source/rtl/color53.prg @@ -95,7 +95,7 @@ FUNCTION GetPairLen( cColor, nColor ) ENDIF nLen := At( ",", SubStr( cColor, nPos ) ) - + RETURN iif( nLen == 0, Len( cColor ) - nPos + 1, nLen - 1 ) FUNCTION GetClrFore( cColor ) diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index e17eba8258..7a93294311 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -85,13 +85,13 @@ */ /* length of buffer for CR/LF characters */ -#if !defined(HB_OS_EOL_LEN) || HB_OS_EOL_LEN < 4 +#if !defined( HB_OS_EOL_LEN ) || HB_OS_EOL_LEN < 4 # define CRLF_BUFFER_LEN 4 #else # define CRLF_BUFFER_LEN HB_OS_EOL_LEN + 1 #endif -#if defined(HB_OS_UNIX_COMPATIBLE) && !defined(HB_EOL_CRLF) +#if defined( HB_OS_UNIX_COMPATIBLE ) && !defined( HB_EOL_CRLF ) static const char s_szCrLf[ CRLF_BUFFER_LEN ] = { HB_CHAR_LF, 0 }; static const int s_iCrLfLen = 1; #else diff --git a/harbour/source/rtl/datec.c b/harbour/source/rtl/datec.c index 86134ef9b9..b5795496d2 100644 --- a/harbour/source/rtl/datec.c +++ b/harbour/source/rtl/datec.c @@ -56,7 +56,7 @@ #include "hbapilng.h" #include "hbdate.h" -#if defined(__CODEGUARD__) +#if defined( __CODEGUARD__ ) static const char s_nullStr[ 4 ] = { 0 }; #else # define s_nullStr "" diff --git a/harbour/source/rtl/dbedit.prg b/harbour/source/rtl/dbedit.prg index 67fb34cc68..965a12f35e 100644 --- a/harbour/source/rtl/dbedit.prg +++ b/harbour/source/rtl/dbedit.prg @@ -137,16 +137,16 @@ FUNCTION DBEDIT( nTop, nLeft, nBottom, nRight, ; cBlock := FieldName( nPos ) cHeading := cBlock ENDIF - - /* Simplified logic compared to CA-Cl*pper. In the latter there - is logic to detect several typical cBlock types (memvar, - aliased field, field) and using MemvarBlock()/FieldWBlock()/FieldBlock() - calls to create codeblocks for them if possible. In Harbour, - simple macro compilation will result in faster code for all - situations. As Maurilio Longo has pointed, there is no point in - creating codeblocks which are able to _assign_ values, as dbEdit() + + /* Simplified logic compared to CA-Cl*pper. In the latter there + is logic to detect several typical cBlock types (memvar, + aliased field, field) and using MemvarBlock()/FieldWBlock()/FieldBlock() + calls to create codeblocks for them if possible. In Harbour, + simple macro compilation will result in faster code for all + situations. As Maurilio Longo has pointed, there is no point in + creating codeblocks which are able to _assign_ values, as dbEdit() is a read-only function. [vszakats] */ - + bBlock := iif( Type( cBlock ) == "M", {|| " " }, hb_macroBlock( cBlock ) ) /* ; */ @@ -305,8 +305,8 @@ STATIC FUNCTION CallUser( oBrowse, xUserFunc, nKey, lAppend, lFlag ) nPrevRecNo := RecNo() - /* NOTE: CA-Cl*pper won't check the type of the return value here, - and will crash if it's a non-NIL, non-numeric type. We're + /* NOTE: CA-Cl*pper won't check the type of the return value here, + and will crash if it's a non-NIL, non-numeric type. We're replicating this behavior. */ nAction := iif( ISBLOCK( xUserFunc ), ; Eval( xUserFunc, nMode, oBrowse:colPos ), ; @@ -345,13 +345,13 @@ STATIC FUNCTION CallUser( oBrowse, xUserFunc, nKey, lAppend, lFlag ) IF EOF() dbGoBottom() ENDIF - + nPrevRecNo := RecNo() oBrowse:refreshAll():forceStable() DO WHILE nPrevRecNo != RecNo() oBrowse:Up():forceStable() ENDDO - + lFlag := .F. ENDIF diff --git a/harbour/source/rtl/devoutp.prg b/harbour/source/rtl/devoutp.prg index cf9e5e4715..d2cc4ed1a3 100644 --- a/harbour/source/rtl/devoutp.prg +++ b/harbour/source/rtl/devoutp.prg @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ diff --git a/harbour/source/rtl/dirdrive.c b/harbour/source/rtl/dirdrive.c index 20814e7b1b..e49e1e3f44 100644 --- a/harbour/source/rtl/dirdrive.c +++ b/harbour/source/rtl/dirdrive.c @@ -120,7 +120,7 @@ HB_FUNC( DISKCHANGE ) HB_FUNC( DISKNAME ) { -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) char szDrive[ 1 ]; szDrive[ 0 ] = ( ( char ) hb_fsCurDrv() ) + 'A'; diff --git a/harbour/source/rtl/diskspac.c b/harbour/source/rtl/diskspac.c index 86b9fee619..0fdf339f24 100644 --- a/harbour/source/rtl/diskspac.c +++ b/harbour/source/rtl/diskspac.c @@ -67,7 +67,7 @@ #if defined( HB_OS_UNIX ) # include # include -# if defined(__WATCOMC__) || defined(__CEGCC__) +# if defined( __WATCOMC__ ) || defined( __CEGCC__ ) # include # elif defined( HB_OS_DARWIN ) # include @@ -82,7 +82,7 @@ HB_FUNC( DISKSPACE ) double dSpace = 0.0; BOOL bError; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { USHORT uiDrive = HB_ISNUM( 1 ) ? hb_parni( 1 ) : 0; union REGS regs; @@ -97,10 +97,10 @@ HB_FUNC( DISKSPACE ) ( double ) regs.HB_XREGS.ax * ( double ) regs.HB_XREGS.cx; } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) { -#if defined(_MSC_VER) || defined(__LCC__) || \ - ( defined(__GNUC__) && !defined(__RSXNT__) ) +#if defined( _MSC_VER ) || defined( __LCC__ ) || \ + ( defined( __GNUC__ ) && !defined( __RSXNT__ ) ) # define HB_GET_LARGE_UINT( v ) ( ( double ) (v).LowPart + \ ( double ) (v).HighPart * \ @@ -122,7 +122,7 @@ HB_FUNC( DISKSPACE ) USHORT uiDrive = uiParam == 0 ? hb_fsCurDrv() + 1 : uiParam; UINT uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS ); -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) TCHAR lpPath[ 4 ]; lpPath[ 0 ] = ( TCHAR ) uiDrive + 'A' - 1; @@ -175,7 +175,7 @@ HB_FUNC( DISKSPACE ) #endif SetErrorMode( uiErrMode ); } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { USHORT uiDrive = HB_ISNUM( 1 ) ? hb_parni( 1 ) : 0; struct _FSALLOCATE fsa; @@ -187,7 +187,7 @@ HB_FUNC( DISKSPACE ) ( double ) fsa.cSectorUnit * ( double ) fsa.cbSector; } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) { const char * szName = hb_parc( 1 ); char * pszFree = NULL; @@ -198,7 +198,7 @@ HB_FUNC( DISKSPACE ) szName = hb_fsNameConv( szName, &pszFree ); { -#if defined(__WATCOMC__) || defined(__CEGCC__) +#if defined( __WATCOMC__ ) || defined( __CEGCC__ ) int iTODO; #else #if defined( HB_OS_DARWIN ) diff --git a/harbour/source/rtl/disksphb.c b/harbour/source/rtl/disksphb.c index 9d3dd990a1..95b97b683b 100644 --- a/harbour/source/rtl/disksphb.c +++ b/harbour/source/rtl/disksphb.c @@ -96,7 +96,7 @@ HB_FUNC( HB_DISKSPACE ) szPath = szPathBuf; } -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { USHORT uiDrive = szPath[ 1 ] != HB_OS_DRIVE_DELIM_CHR ? 0 : ( szPath[ 0 ] >= 'A' && szPath[ 0 ] <= 'Z' ? @@ -148,10 +148,10 @@ HB_FUNC( HB_DISKSPACE ) break; } } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) { -#if defined(_MSC_VER) || defined(__LCC__) || \ - ( defined(__GNUC__) && !defined(__RSXNT__) ) +#if defined( _MSC_VER ) || defined( __LCC__ ) || \ + ( defined( __GNUC__ ) && !defined( __RSXNT__ ) ) # define HB_GET_LARGE_UINT( v ) ( ( double ) (v).LowPart + \ ( double ) (v).HighPart * \ @@ -175,7 +175,7 @@ HB_FUNC( HB_DISKSPACE ) UINT uiErrMode = SetErrorMode( SEM_FAILCRITICALERRORS ); BOOL fResult; -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) LPTSTR lpPath = HB_TCHAR_CONVTO( szPath ); fResult = GetDiskFreeSpaceEx( lpPath, @@ -283,7 +283,7 @@ HB_FUNC( HB_DISKSPACE ) break; } } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { struct _FSALLOCATE fsa; USHORT rc; @@ -328,9 +328,9 @@ HB_FUNC( HB_DISKSPACE ) else hb_fsSetIOError( FALSE, 0 ); } -#elif defined(HB_OS_UNIX) && !( defined(__WATCOMC__) || defined(__CEGCC__) ) +#elif defined( HB_OS_UNIX ) && !( defined( __WATCOMC__ ) || defined( __CEGCC__ ) ) { -#if defined(HB_OS_DARWIN) +#if defined( HB_OS_DARWIN ) struct statfs sf; #else struct statvfs sf; @@ -339,7 +339,7 @@ HB_FUNC( HB_DISKSPACE ) szPath = hb_fsNameConv( szPath, &pszFree ); -#if defined(HB_OS_DARWIN) +#if defined( HB_OS_DARWIN ) if( statfs( szPath, &sf ) == 0 ) #else if( statvfs( szPath, &sf ) == 0 ) diff --git a/harbour/source/rtl/einstv52.prg b/harbour/source/rtl/einstv52.prg index ead8e1ebc2..cf7321f432 100644 --- a/harbour/source/rtl/einstv52.prg +++ b/harbour/source/rtl/einstv52.prg @@ -65,7 +65,7 @@ FUNCTION __eInstVar52( oVar, cMethod, xValue, cType, nSubCode, xMin, xMax ) IF xMin != NIL lError := !( xValue >= xMin ) ENDIF - /* NOTE: In CA-Cl*pper 5.2, xMin validation result is + /* NOTE: In CA-Cl*pper 5.2, xMin validation result is ignored when xMax != NIL. Harbour is doing the same. */ IF xMax != NIL lError := !( xValue <= xMax ) diff --git a/harbour/source/rtl/filebuf.c b/harbour/source/rtl/filebuf.c index 3d6b0ce7b7..387b0a2d20 100644 --- a/harbour/source/rtl/filebuf.c +++ b/harbour/source/rtl/filebuf.c @@ -63,7 +63,7 @@ typedef struct _HB_FILE * PHB_FILE; #include "hbthread.h" #include "hbvm.h" -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) # include # include #endif diff --git a/harbour/source/rtl/filehb.c b/harbour/source/rtl/filehb.c index 032864d1c6..0e8c642585 100644 --- a/harbour/source/rtl/filehb.c +++ b/harbour/source/rtl/filehb.c @@ -57,7 +57,7 @@ the required attribute. */ /* NOTE: CA-Cl*pper RTrim()s the filename before doing the existence check. - This is not multiplatform friendly, so Harbour doesn't do any + This is not multiplatform friendly, so Harbour doesn't do any modification on the filename. [vszakats] For easier portability in Harbour user can optionally enable leading and trailing spaces stripping by diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 0e277590f5..2814e86de7 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -116,7 +116,7 @@ #include "hb_io.h" #include "hbset.h" -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) #include #include #include @@ -127,9 +127,9 @@ #endif #endif -#if ( defined(__DMC__) || defined(__BORLANDC__) || \ - defined(__IBMCPP__) || defined(_MSC_VER) || \ - defined(__MINGW32__) || defined(__WATCOMC__) ) && \ +#if ( defined( __DMC__ ) || defined( __BORLANDC__ ) || \ + defined( __IBMCPP__ ) || defined( _MSC_VER ) || \ + defined( __MINGW32__ ) || defined( __WATCOMC__ ) ) && \ !defined( HB_OS_UNIX ) && !defined( HB_OS_WIN_CE ) #include #include @@ -138,50 +138,50 @@ #include #endif #include - #if defined(__BORLANDC__) + #if defined( __BORLANDC__ ) #include #include - #elif defined(__WATCOMC__) + #elif defined( __WATCOMC__ ) #include #endif - #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__DMC__) + #if defined( _MSC_VER ) || defined( __MINGW32__ ) || defined( __DMC__ ) #include #define ftruncate _chsize - #if defined(__MINGW32__) && !defined(_LK_UNLCK) + #if defined( __MINGW32__ ) && !defined( _LK_UNLCK ) #define _LK_UNLCK _LK_UNLOCK #endif #else #define ftruncate chsize #endif - #if !defined(HAVE_POSIX_IO) + #if !defined( HAVE_POSIX_IO ) #define HAVE_POSIX_IO #endif -#elif defined(__GNUC__) || defined(HB_OS_UNIX) +#elif defined( __GNUC__ ) || defined( HB_OS_UNIX ) #include #include #include - #if defined(__CYGWIN__) + #if defined( __CYGWIN__ ) #include - #elif defined(__DJGPP__) + #elif defined( __DJGPP__ ) #include #include #include #endif - #if !defined(HAVE_POSIX_IO) + #if !defined( HAVE_POSIX_IO ) #define HAVE_POSIX_IO #endif #endif -#if defined(__MPW__) +#if defined( __MPW__ ) #include #endif -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) #include #include #include -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) #include #include #ifndef SH_COMPAT @@ -191,7 +191,7 @@ #include #if !defined( INVALID_SET_FILE_POINTER ) && \ - ( defined(__DMC__) || defined( _MSC_VER ) || defined( __LCC__ ) ) + ( defined( __DMC__ ) || defined( _MSC_VER ) || defined( __LCC__ ) ) #define INVALID_SET_FILE_POINTER ( ( DWORD ) -1 ) #endif #if !defined( INVALID_FILE_ATTRIBUTES ) @@ -215,7 +215,7 @@ #endif #endif -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) /* 27/08/2004 - HB_FS_GETDRIVE() should return a number in the range 0..25 ('A'..'Z') HB_FS_SETDRIVE() should accept a number inside same range. @@ -241,7 +241,7 @@ _dos_setdrive( ( n ) + 1, &uiDummy ); \ } while( 0 ) -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) #define HB_FS_GETDRIVE(n) do { n = _getdrive() - 'A'; } while( 0 ) #define HB_FS_SETDRIVE(n) _chdrive( ( n ) + 'A' ) @@ -276,12 +276,12 @@ #endif -#if defined(HAVE_POSIX_IO) || defined( HB_IO_WIN ) || defined(_MSC_VER) || defined(__MINGW32__) || defined(__LCC__) || defined(__DMC__) +#if defined( HAVE_POSIX_IO ) || defined( HB_IO_WIN ) || defined( _MSC_VER ) || defined( __MINGW32__ ) || defined( __LCC__ ) || defined( __DMC__ ) /* Only compilers with Posix or Posix-like I/O support are supported */ #define HB_FS_FILE_IO #endif -#if defined(__DMC__) || defined(_MSC_VER) || defined(__MINGW32__) || defined(__IBMCPP__) || defined(__WATCOMC__) || defined(HB_OS_OS2) +#if defined( __DMC__ ) || defined( _MSC_VER ) || defined( __MINGW32__ ) || defined( __IBMCPP__ ) || defined( __WATCOMC__ ) || defined( HB_OS_OS2 ) /* These compilers use sopen() rather than open(), because their versions of open() do not support combined O_ and SH_ flags */ #define HB_FS_SOPEN @@ -295,9 +295,9 @@ static BOOL s_fUseWaitLocks = TRUE; -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) static HANDLE DosToWinHandle( HB_FHANDLE fHandle ) { @@ -535,7 +535,7 @@ HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsGetOsHandle(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) return ( HB_FHANDLE ) DosToWinHandle( hFileHandle ); #else return hFileHandle; @@ -548,7 +548,7 @@ HB_FHANDLE hb_fsPOpen( const char * pFilename, const char * pMode ) HB_TRACE(HB_TR_DEBUG, ("hb_fsPOpen(%p, %s)", pFilename, pMode)); -#if defined(HB_OS_UNIX_COMPATIBLE) && !defined(__CYGWIN__) +#if defined( HB_OS_UNIX_COMPATIBLE ) && !defined( __CYGWIN__ ) { HB_FHANDLE hPipeHandle[2], hNullHandle; pid_t pid; @@ -656,7 +656,7 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags ) pFilename = hb_fsNameConv( pFilename, &pszFree ); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) { DWORD dwMode, dwShare, dwCreat, dwAttr; HANDLE hFile; @@ -671,19 +671,19 @@ HB_FHANDLE hb_fsOpen( const char * pFilename, USHORT uiFlags ) hFileHandle = ( HB_FHANDLE ) hFile; } -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) { int flags, share, attr; unsigned mode; convert_open_flags( FALSE, FC_NORMAL, uiFlags, &flags, &mode, &share, &attr ); hb_vmUnlock(); -#if defined(_MSC_VER) || defined(__DMC__) +#if defined( _MSC_VER ) || defined( __DMC__ ) if( share ) hFileHandle = _sopen( pFilename, flags, share, mode ); else hFileHandle = _open( pFilename, flags, mode ); -#elif defined(HB_FS_SOPEN) +#elif defined( HB_FS_SOPEN ) if( share ) hFileHandle = sopen( pFilename, flags, share, mode ); else @@ -716,7 +716,7 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, ULONG ulAttr ) pFilename = hb_fsNameConv( pFilename, &pszFree ); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) { DWORD dwMode, dwShare, dwCreat, dwAttr; HANDLE hFile; @@ -731,16 +731,16 @@ HB_FHANDLE hb_fsCreate( const char * pFilename, ULONG ulAttr ) hFileHandle = ( HB_FHANDLE ) hFile; } -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) { int flags, share, attr; unsigned mode; convert_open_flags( TRUE, ulAttr, FO_EXCLUSIVE, &flags, &mode, &share, &attr ); hb_vmUnlock(); -#if defined(HB_FS_DOSCREAT) +#if defined( HB_FS_DOSCREAT ) hFileHandle = _creat( pFilename, attr ); -#elif defined(HB_FS_SOPEN) +#elif defined( HB_FS_SOPEN ) hFileHandle = open( pFilename, flags, mode ); #else hFileHandle = open( pFilename, flags | share, mode ); @@ -791,14 +791,14 @@ HB_FHANDLE hb_fsCreateEx( const char * pFilename, ULONG ulAttr, USHORT uiFlags ) hFileHandle = ( HB_FHANDLE ) hFile; } -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) { int flags, share, attr; unsigned mode; convert_open_flags( TRUE, ulAttr, uiFlags, &flags, &mode, &share, &attr ); hb_vmUnlock(); -#if defined(HB_FS_SOPEN) +#if defined( HB_FS_SOPEN ) hFileHandle = open( pFilename, flags, mode ); #else hFileHandle = open( pFilename, flags | share, mode ); @@ -823,10 +823,10 @@ void hb_fsClose( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsClose(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) hb_vmUnlock(); - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) hb_fsSetIOError( CloseHandle( DosToWinHandle( hFileHandle ) ), 0 ); #else hb_fsSetIOError( close( hFileHandle ) == 0, 0 ); @@ -846,12 +846,12 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) /* TODO: HB_IO_WIN support */ -#if defined(__BORLANDC__) || defined(__IBMCPP__) || defined(__DJGPP__) || \ - defined(__CYGWIN__) || defined(__WATCOMC__) || defined(HB_OS_OS2) +#if defined( __BORLANDC__ ) || defined( __IBMCPP__ ) || defined( __DJGPP__ ) || \ + defined( __CYGWIN__ ) || defined( __WATCOMC__ ) || defined( HB_OS_OS2 ) { int iRet = 0; -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) if( hFileHandle != ( HB_FHANDLE ) 0 && hFileHandle != ( HB_FHANDLE ) 1 && hFileHandle != ( HB_FHANDLE ) 2 ) @@ -873,12 +873,12 @@ BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) return iRet != -1; } -#elif ( defined(_MSC_VER) || defined(__MINGW32__) || defined(__DMC__) ) && \ - !defined(HB_OS_WIN_CE) +#elif ( defined( _MSC_VER ) || defined( __MINGW32__ ) || defined( __DMC__ ) ) && \ + !defined( HB_OS_WIN_CE ) { int iRet = 0; -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) if( hFileHandle != ( HB_FHANDLE ) 0 && hFileHandle != ( HB_FHANDLE ) 1 && hFileHandle != ( HB_FHANDLE ) 2 ) @@ -1031,7 +1031,7 @@ BOOL hb_fsGetAttr( const char * pszFileName, ULONG * pulAttr ) #elif defined( HB_OS_DOS ) hb_vmUnlock(); { -#if defined( __DJGPP__ ) || defined(__BORLANDC__) +#if defined( __DJGPP__ ) || defined( __BORLANDC__ ) int attr = _chmod( pszFileName, 0, 0 ); if( attr != -1 ) #else @@ -1378,9 +1378,9 @@ USHORT hb_fsRead( HB_FHANDLE hFileHandle, void * pBuff, USHORT uiCount ) HB_TRACE(HB_TR_DEBUG, ("hb_fsRead(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) { DWORD dwRead; BOOL fResult; @@ -1418,9 +1418,9 @@ USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const void * pBuff, USHORT uiCount ) HB_TRACE(HB_TR_DEBUG, ("hb_fsWrite(%p, %p, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, uiCount)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) { DWORD dwWritten = 0; BOOL fResult; @@ -1453,7 +1453,7 @@ USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const void * pBuff, USHORT uiCount ) else { hb_vmUnlock(); -#if defined(HB_USE_LARGEFILE64) +#if defined( HB_USE_LARGEFILE64 ) hb_fsSetIOError( ftruncate64( hFileHandle, lseek64( hFileHandle, 0L, SEEK_CUR ) ) != -1, 0 ); #else hb_fsSetIOError( ftruncate( hFileHandle, lseek( hFileHandle, 0L, SEEK_CUR ) ) != -1, 0 ); @@ -1478,16 +1478,16 @@ ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount ) HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLarge(%p, %p, %lu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) { hb_vmUnlock(); hb_fsSetIOError( ReadFile( DosToWinHandle( hFileHandle ), pBuff, ulCount, &ulRead, NULL ), 0 ); hb_vmLock(); } - #elif defined(HB_FS_LARGE_OPTIMIZED) + #elif defined( HB_FS_LARGE_OPTIMIZED ) { hb_vmUnlock(); ulRead = read( hFileHandle, pBuff, ulCount ); @@ -1558,9 +1558,9 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteLarge(%p, %p, %lu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) { ulWritten = 0; hb_vmUnlock(); @@ -1576,7 +1576,7 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount } #else if( ulCount ) - #if defined(HB_FS_LARGE_OPTIMIZED) + #if defined( HB_FS_LARGE_OPTIMIZED ) { hb_vmUnlock(); ulWritten = write( hFileHandle, pBuff, ulCount ); @@ -1634,7 +1634,7 @@ ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount else { hb_vmUnlock(); -#if defined(HB_USE_LARGEFILE64) +#if defined( HB_USE_LARGEFILE64 ) hb_fsSetIOError( ftruncate64( hFileHandle, lseek64( hFileHandle, 0L, SEEK_CUR ) ) != -1, 0 ); #else hb_fsSetIOError( ftruncate( hFileHandle, lseek( hFileHandle, 0L, SEEK_CUR ) ) != -1, 0 ); @@ -1660,12 +1660,12 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %p, %lu, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount, llOffset)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) -# if defined(HB_OS_UNIX) && !defined(__WATCOMC__) +# if defined( HB_OS_UNIX ) && !defined( __WATCOMC__ ) { hb_vmUnlock(); -# if defined(HB_USE_LARGEFILE64) +# if defined( HB_USE_LARGEFILE64 ) ulRead = pread64( hFileHandle, pBuff, ulCount, llOffset ); # else ulRead = pread( hFileHandle, pBuff, ulCount, llOffset ); @@ -1678,7 +1678,7 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS # else ulRead = 0; hb_vmUnlock(); -# if defined(HB_IO_WIN) +# if defined( HB_IO_WIN ) if( hb_iswinnt() ) { OVERLAPPED Overlapped; @@ -1707,12 +1707,12 @@ ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, void * pBuff, ULONG ulCount, HB_FOFFS /* TOFIX: this is not atom operation. It has to be fixed for RDD * file access with shared file handles in aliased work areas */ -# elif defined(HB_FS_LARGE_OPTIMIZED) +# elif defined( HB_FS_LARGE_OPTIMIZED ) { HB_FOFFSET llPos; -# if defined(HB_USE_LARGEFILE64) +# if defined( HB_USE_LARGEFILE64 ) llPos = lseek64( hFileHandle, llOffset, SEEK_SET ); -# elif defined(HB_OS_OS2) +# elif defined( HB_OS_OS2 ) ULONG ulPos; if( DosSetFilePtr( hFileHandle, lOffset, SEEK_SET, &ulPos ) == 0 ) llPos = ( HB_FOFFSET ) ulPos; @@ -1754,12 +1754,12 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H HB_TRACE(HB_TR_DEBUG, ("hb_fsWriteAt(%p, %p, %lu, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, pBuff, ulCount, llOffset)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) -# if defined(HB_OS_UNIX) && !defined(__WATCOMC__) +# if defined( HB_OS_UNIX ) && !defined( __WATCOMC__ ) { hb_vmUnlock(); -# if defined(HB_USE_LARGEFILE64) +# if defined( HB_USE_LARGEFILE64 ) ulWritten = pwrite64( hFileHandle, pBuff, ulCount, llOffset ); # else ulWritten = pwrite( hFileHandle, pBuff, ulCount, llOffset ); @@ -1772,7 +1772,7 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H # else ulWritten = 0; hb_vmUnlock(); -# if defined(HB_IO_WIN) +# if defined( HB_IO_WIN ) if( hb_iswinnt() ) { OVERLAPPED Overlapped; @@ -1801,12 +1801,12 @@ ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const void * pBuff, ULONG ulCount, H /* TOFIX: this is not atom operation. It has to be fixed for RDD * file access with shared file handles in aliased work areas */ -# elif defined(HB_FS_LARGE_OPTIMIZED) +# elif defined( HB_FS_LARGE_OPTIMIZED ) { HB_FOFFSET llPos; -# if defined(HB_USE_LARGEFILE64) +# if defined( HB_USE_LARGEFILE64 ) llPos = lseek64( hFileHandle, llOffset, SEEK_SET ); -# elif defined(HB_OS_OS2) +# elif defined( HB_OS_OS2 ) ULONG ulPos; if( DosSetFilePtr( hFileHandle, lOffset, SEEK_SET, &ulPos ) == 0 ) llPos = ( HB_FOFFSET ) ulPos; @@ -1848,10 +1848,10 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) HB_TRACE(HB_TR_DEBUG, ("hb_fsReadAt(%p, %" PFHL "i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, llOffset)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) hb_vmUnlock(); - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) { ULONG ulOffsetLow = ( ULONG ) ( llOffset & ULONG_MAX ), ulOffsetHigh = ( ULONG ) ( llOffset >> 32 ); @@ -1869,7 +1869,7 @@ BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) else fResult = FALSE; } - #elif defined(HB_USE_LARGEFILE64) + #elif defined( HB_USE_LARGEFILE64 ) fResult = ftruncate64( hFileHandle, llOffset ) != -1; #else fResult = ftruncate( hFileHandle, llOffset ) != -1; @@ -1891,13 +1891,13 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsCommit(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { hb_vmUnlock(); - #if defined(HB_IO_WIN) + #if defined( HB_IO_WIN ) hb_fsSetIOError( FlushFileBuffers( ( HANDLE ) DosToWinHandle( hFileHandle ) ), 0 ); #else - #if defined(__WATCOMC__) + #if defined( __WATCOMC__ ) hb_fsSetIOError( fsync( hFileHandle ) == 0, 0 ); #else hb_fsSetIOError( _commit( hFileHandle ) == 0, 0 ); @@ -1906,7 +1906,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) hb_vmLock(); } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { hb_vmUnlock(); @@ -1914,7 +1914,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) hb_vmLock(); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) /* NOTE: close() functions releases all locks regardles if it is an * original or duplicated file handle @@ -1927,7 +1927,7 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) * As workaround we are using this trick to check non zero version * number but on some systems it may disable using fdatasync() [druzus] */ - #if defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO + 0 > 0 + #if defined( _POSIX_SYNCHRONIZED_IO ) && _POSIX_SYNCHRONIZED_IO + 0 > 0 /* faster - flushes data buffers only, without updating directory info */ hb_fsSetIOError( fdatasync( hFileHandle ) == 0, 0 ); @@ -1938,13 +1938,13 @@ void hb_fsCommit( HB_FHANDLE hFileHandle ) #endif hb_vmLock(); -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) hb_vmUnlock(); hb_fsSetIOError( fsync( hFileHandle ) == 0, 0 ); hb_vmLock(); -#elif defined(HB_FS_FILE_IO) && !defined(HB_OS_OS2) && !defined(HB_OS_UNIX) +#elif defined( HB_FS_FILE_IO ) && !defined( HB_OS_OS2 ) && !defined( HB_OS_UNIX ) /* This hack is very dangerous. POSIX standard define that if _ANY_ file handle is closed all locks set by the process on the file @@ -1982,7 +1982,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, HB_TRACE(HB_TR_DEBUG, ("hb_fsLock(%p, %lu, %lu, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode)); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) hb_vmUnlock(); switch( uiMode & FL_MASK ) { @@ -2028,7 +2028,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, } hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { struct _FILELOCK fl, ful; @@ -2063,7 +2063,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, hb_fsSetIOError( bResult, 0 ); hb_vmLock(); } -#elif defined(_MSC_VER) || defined(__DMC__) +#elif defined( _MSC_VER ) || defined( __DMC__ ) { ULONG ulOldPos; @@ -2087,7 +2087,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, hb_vmLock(); lseek( hFileHandle, ulOldPos, SEEK_SET ); } -#elif defined(__MINGW32__) +#elif defined( __MINGW32__ ) { ULONG ulOldPos; @@ -2111,7 +2111,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, hb_vmLock(); lseek( hFileHandle, ulOldPos, SEEK_SET ); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) { /* TODO: check for append locks (SEEK_END) */ @@ -2150,7 +2150,7 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, hb_fsSetIOError( bResult, 0 ); hb_vmLock(); } -#elif defined(HAVE_POSIX_IO) && !defined(__IBMCPP__) && ( !defined(__GNUC__) || defined(__DJGPP__) ) +#elif defined( HAVE_POSIX_IO ) && !defined( __IBMCPP__ ) && ( !defined( __GNUC__ ) || defined( __DJGPP__ ) ) hb_vmUnlock(); switch( uiMode & FL_MASK ) @@ -2186,7 +2186,7 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, HB_TRACE(HB_TR_DEBUG, ("hb_fsLockLarge(%p, %" PFHL "u, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, ulStart, ulLength, uiMode)); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) { DWORD dwOffsetLo = ( DWORD ) ( ulStart & 0xFFFFFFFF ), dwOffsetHi = ( DWORD ) ( ulStart >> 32 ), @@ -2249,7 +2249,7 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, hb_fsSetIOError( bResult, 0 ); hb_vmLock(); } -#elif defined(HB_USE_LARGEFILE64) +#elif defined( HB_USE_LARGEFILE64 ) { struct flock64 lock_info; @@ -2299,12 +2299,12 @@ ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) HB_TRACE(HB_TR_DEBUG, ("hb_fsSeek(%p, %ld, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, lOffset, uiFlags)); -#if defined(HB_FS_FILE_IO) +#if defined( HB_FS_FILE_IO ) { USHORT Flags = convert_seek_flags( uiFlags ); hb_vmUnlock(); - #if defined(HB_OS_OS2) + #if defined( HB_OS_OS2 ) { APIRET ret; @@ -2331,7 +2331,7 @@ ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) } } } - #elif defined(HB_IO_WIN) + #elif defined( HB_IO_WIN ) /* This DOS hack creates 2GB file size limit, Druzus */ if( lOffset < 0 && Flags == SEEK_SET ) { @@ -2385,7 +2385,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u HB_TRACE(HB_TR_DEBUG, ("hb_fsSeekLarge(%p, %" PFHL "i, %hu)", ( void * ) ( HB_PTRDIFF ) hFileHandle, llOffset, uiFlags)); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) { USHORT Flags = convert_seek_flags( uiFlags ); @@ -2416,7 +2416,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u } hb_vmLock(); } -#elif defined(HB_USE_LARGEFILE64) +#elif defined( HB_USE_LARGEFILE64 ) { USHORT Flags = convert_seek_flags( uiFlags ); @@ -2461,14 +2461,14 @@ BOOL hb_fsDelete( const char * pFilename ) pFilename = hb_fsNameConv( pFilename, &pszFree ); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = DeleteFileA( pFilename ); hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) hb_vmUnlock(); bResult = ( remove( pFilename ) == 0 ); @@ -2498,14 +2498,14 @@ BOOL hb_fsRename( const char * pOldName, const char * pNewName ) pOldName = hb_fsNameConv( pOldName, &pszFreeOld ); pNewName = hb_fsNameConv( pNewName, &pszFreeNew ); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = MoveFileA( pOldName, pNewName ); hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) hb_vmUnlock(); bResult = ( rename( pOldName, pNewName ) == 0 ); @@ -2538,19 +2538,19 @@ BOOL hb_fsMkDir( const char * pDirname ) HB_TRACE(HB_TR_DEBUG, ("hb_fsMkDir(%s)", pDirname)); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = CreateDirectoryA( pDirname, NULL ); hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HAVE_POSIX_IO) || defined(__MINGW32__) +#elif defined( HAVE_POSIX_IO ) || defined( __MINGW32__ ) hb_vmUnlock(); -# if ! defined(HB_OS_UNIX) && \ - ( defined(__WATCOMC__) || defined(__BORLANDC__) || \ - defined(__IBMCPP__) || defined(__MINGW32__) ) +# if ! defined( HB_OS_UNIX ) && \ + ( defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || \ + defined( __IBMCPP__ ) || defined( __MINGW32__ ) ) bResult = ( mkdir( pDirname ) == 0 ); # else bResult = ( mkdir( pDirname, S_IRWXU | S_IRWXG | S_IRWXO ) == 0 ); @@ -2580,14 +2580,14 @@ BOOL hb_fsChDir( const char * pDirname ) pDirname = hb_fsNameConv( pDirname, &pszFree ); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = SetCurrentDirectoryA( pDirname ); hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HAVE_POSIX_IO) || defined(__MINGW32__) +#elif defined( HAVE_POSIX_IO ) || defined( __MINGW32__ ) hb_vmUnlock(); bResult = ( chdir( pDirname ) == 0 ); @@ -2616,14 +2616,14 @@ BOOL hb_fsRmDir( const char * pDirname ) pDirname = hb_fsNameConv( pDirname, &pszFree ); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = RemoveDirectoryA( pDirname ); hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HAVE_POSIX_IO) || defined(__MINGW32__) +#elif defined( HAVE_POSIX_IO ) || defined( __MINGW32__ ) hb_vmUnlock(); bResult = ( rmdir( pDirname ) == 0 ); @@ -2677,9 +2677,9 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) * It will allow us to add drive emulation in hb_fsCurDrv()/hb_fsChDrv() * and hb_fsNameConv() */ -#if defined(HB_OS_WIN) || \ - ( !( defined(HB_OS_OS2) && defined(__GNUC__) ) && \ - !defined(__MINGW32__) && defined(HAVE_POSIX_IO) ) +#if defined( HB_OS_WIN ) || \ + ( !( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) && \ + !defined( __MINGW32__ ) && defined( HAVE_POSIX_IO ) ) if( uiDrive ) { uiCurDrv = hb_fsCurDrv() + 1; @@ -2688,28 +2688,28 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) } #endif -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); fResult = GetCurrentDirectoryA( ulSize, pszBuffer ); hb_fsSetIOError( fResult, 0 ); hb_vmLock(); -#elif defined(HB_OS_OS2) && defined(__GNUC__) +#elif defined( HB_OS_OS2 ) && defined( __GNUC__ ) hb_vmUnlock(); fResult = ( _getcwd1( pszBuffer, uiDrive + 'A' - 1 ) == 0 ); hb_fsSetIOError( fResult, 0 ); hb_vmLock(); -#elif defined(__MINGW32__) +#elif defined( __MINGW32__ ) hb_vmUnlock(); fResult = ( _getdcwd( uiDrive, pszBuffer, ulSize ) != NULL ); hb_fsSetIOError( fResult, 0 ); hb_vmLock(); -#elif defined(HAVE_POSIX_IO) +#elif defined( HAVE_POSIX_IO ) hb_vmUnlock(); fResult = ( getcwd( pszBuffer, ulSize ) != NULL ); @@ -2739,7 +2739,7 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) /* NOTE: A trailing underscore is not returned on this platform, so we don't need to strip it. [vszakats] */ -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) /* convert '/' to '\' */ while( ( pszStart = strchr( pszBuffer, '/' ) ) != NULL ) *pszStart = '\\'; @@ -2748,7 +2748,7 @@ USHORT hb_fsCurDirBuff( USHORT uiDrive, char * pszBuffer, ULONG ulSize ) pszStart = pszBuffer; ulLen = strlen( pszBuffer ); -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) if( pszStart[ 1 ] == HB_OS_DRIVE_DELIM_CHR ) { pszStart += 2; @@ -2793,7 +2793,7 @@ USHORT hb_fsChDrv( BYTE nDrive ) HB_TRACE(HB_TR_DEBUG, ("hb_fsChDrv(%d)", (int) nDrive)); -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) { /* 'unsigned int' _have to_ be used in Watcom */ UINT uiSave, uiNewDrive; @@ -2837,7 +2837,7 @@ BYTE hb_fsCurDrv( void ) HB_TRACE(HB_TR_DEBUG, ("hb_fsCurDrv()")); -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) hb_vmUnlock(); HB_FS_GETDRIVE( uiResult ); @@ -2866,7 +2866,7 @@ USHORT hb_fsIsDrv( BYTE nDrive ) HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDrv(%d)", (int) nDrive)); -#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) { char buffer[ 4 ]; UINT type; @@ -2882,7 +2882,7 @@ USHORT hb_fsIsDrv( BYTE nDrive ) uiResult = ( type == DRIVE_UNKNOWN || type == DRIVE_NO_ROOT_DIR ) ? F_ERROR : 0; hb_fsSetError( 0 ); } -#elif defined(HB_OS_HAS_DRIVE_LETTER) +#elif defined( HB_OS_HAS_DRIVE_LETTER ) { /* 'unsigned int' _have to_ be used in Watcom */ @@ -2924,14 +2924,14 @@ BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDevice(%p)", ( void * ) ( HB_PTRDIFF ) hFileHandle)); -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) hb_vmUnlock(); bResult = GetFileType( DosToWinHandle( hFileHandle ) ) == FILE_TYPE_CHAR; hb_fsSetIOError( bResult, 0 ); hb_vmLock(); -#elif defined(HB_FS_FILE_IO) +#elif defined( HB_FS_FILE_IO ) hb_vmUnlock(); #if defined( _MSC_VER ) || defined( __MINGW32__ ) @@ -3154,9 +3154,9 @@ BOOL hb_fsEof( HB_FHANDLE hFileHandle ) hb_vmUnlock(); -#if defined(__DJGPP__) || defined(__CYGWIN__) || \ - defined(HB_IO_WIN) || defined(HB_OS_WIN_CE) || \ - defined(HB_OS_UNIX_COMPATIBLE) +#if defined( __DJGPP__ ) || defined( __CYGWIN__ ) || \ + defined( HB_IO_WIN ) || defined( HB_OS_WIN_CE ) || \ + defined( HB_OS_UNIX_COMPATIBLE ) { HB_FOFFSET curPos; HB_FOFFSET endPos; diff --git a/harbour/source/rtl/fserr.c b/harbour/source/rtl/fserr.c index ad5fce8600..c401eb1b8b 100644 --- a/harbour/source/rtl/fserr.c +++ b/harbour/source/rtl/fserr.c @@ -56,18 +56,18 @@ #include "hbapifs.h" #include "hbstack.h" #include "hb_io.h" -#if !(defined(HB_IO_WIN) || defined(HB_OS_WIN)) +#if !( defined( HB_IO_WIN ) || defined( HB_OS_WIN ) ) # include #endif /* Try to translate C errno into DOS error code */ -#if !defined(HB_IO_WIN) +#if !defined( HB_IO_WIN ) static int hb_errnoToDosError( int ErrCode ) { int iResult; -#if defined(__BORLANDC__) +#if defined( __BORLANDC__ ) /* These C compilers use DOS error codes in errno */ iResult = ErrCode; #else @@ -144,7 +144,7 @@ static int hb_errnoToDosError( int ErrCode ) } #endif -#if defined(HB_IO_WIN) || defined(HB_OS_WIN) +#if defined( HB_IO_WIN ) || defined( HB_OS_WIN ) static int hb_WinToDosError( ULONG ulError ) { int iResult; @@ -235,10 +235,10 @@ void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) } else { -#if defined(HB_IO_WIN) || defined(HB_OS_WIN) +#if defined( HB_IO_WIN ) || defined( HB_OS_WIN ) uiOsErrorLast = ( USHORT ) GetLastError(); uiErrorLast = ( USHORT ) hb_WinToDosError( uiOsErrorLast ); -#elif defined(_MSC_VER) || defined(__DMC__) +#elif defined( _MSC_VER ) || defined( __DMC__ ) #ifdef __XCC__ extern unsigned long _doserrno; extern void __cdecl _dosmaperr( unsigned long oserrno ); diff --git a/harbour/source/rtl/fssize.c b/harbour/source/rtl/fssize.c index 262451bad3..a4d34f97e0 100644 --- a/harbour/source/rtl/fssize.c +++ b/harbour/source/rtl/fssize.c @@ -59,7 +59,7 @@ #include "hbapifs.h" #include "hbvm.h" -#if !defined(HB_OS_WIN_CE) +#if !defined( HB_OS_WIN_CE ) # include # include #endif @@ -82,7 +82,7 @@ HB_FOFFSET hb_fsFSize( const char * pszFileName, BOOL bUseDirEntry ) { if( bUseDirEntry ) { -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) char * pszFree; PHB_FFIND ffind; pszFileName = hb_fsNameConv( pszFileName, &pszFree ); diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c index 27791b3f5e..f1e8eeaacc 100644 --- a/harbour/source/rtl/fstemp.c +++ b/harbour/source/rtl/fstemp.c @@ -64,7 +64,7 @@ #include /* We need for mkstemp() on BSD */ #endif -#if !defined(HB_OS_WIN) +#if !defined( HB_OS_WIN ) static BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir ) { BOOL fOK = FALSE; @@ -88,7 +88,7 @@ static BOOL fsGetTempDirByCase( char * pszName, const char * pszTempDir ) } } -# if defined(__DJGPP__) +# if defined( __DJGPP__ ) if( fOK ) { /* convert '/' to '\' */ @@ -118,7 +118,7 @@ static HB_FHANDLE hb_fsCreateTempLow( const char * pszDir, const char * pszPrefi } else { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) if( ! GetTempPathA( ( DWORD ) ( HB_PATH_MAX - 1 ), pszName ) ) { pszName[ 0 ] = '.'; @@ -159,7 +159,7 @@ static HB_FHANDLE hb_fsCreateTempLow( const char * pszDir, const char * pszPrefi if( iLen > ( HB_PATH_MAX - 1 ) - 6 ) return FS_ERROR; -#if !defined(__WATCOMC__) && ( defined( HB_OS_LINUX ) || defined( HB_OS_BSD ) ) +#if !defined( __WATCOMC__ ) && ( defined( HB_OS_LINUX ) || defined( HB_OS_BSD ) ) if( hb_setGetFileCase() != HB_SET_CASE_LOWER && hb_setGetFileCase() != HB_SET_CASE_UPPER && hb_setGetDirCase() != HB_SET_CASE_LOWER && @@ -209,7 +209,7 @@ static BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * p hb_vmUnlock(); -#if defined(HB_IO_WIN) +#if defined( HB_IO_WIN ) { char szTempDir[ HB_PATH_MAX ]; @@ -240,7 +240,7 @@ static BOOL hb_fsTempName( char * pszBuffer, const char * pszDir, const char * p pszBuffer[ 0 ] = '\0'; fResult = ( tmpnam( pszBuffer ) != NULL ); -# if defined(__DJGPP__) +# if defined( __DJGPP__ ) { /* convert '/' to '\' */ char * pszDelim; diff --git a/harbour/source/rtl/gete.c b/harbour/source/rtl/gete.c index 9d72280969..cd73c95dce 100644 --- a/harbour/source/rtl/gete.c +++ b/harbour/source/rtl/gete.c @@ -91,7 +91,7 @@ HB_FUNC( GETENV ) /* NOTE: Convert the envvar name to uppercase. This is required for DOS and OS/2 systems. [vszakats] */ -#if defined(HB_OS_DOS) || defined(HB_OS_OS2) +#if defined( HB_OS_DOS ) || defined( HB_OS_OS2 ) hb_strupr( pszName ); #endif szValue = hb_getenv( pszName ); @@ -160,7 +160,7 @@ HB_FUNC( HB_GETENV ) /* NOTE: Convert the envvar name to uppercase. This is required for DOS and OS/2 systems. [vszakats] */ -#if defined(HB_OS_DOS) || defined(HB_OS_OS2) +#if defined( HB_OS_DOS ) || defined( HB_OS_OS2 ) hb_strupr( pszName ); #endif szValue = hb_getenv( pszName ); diff --git a/harbour/source/rtl/getsys53.prg b/harbour/source/rtl/getsys53.prg index 9eb8d32dd3..18f2432fc9 100644 --- a/harbour/source/rtl/getsys53.prg +++ b/harbour/source/rtl/getsys53.prg @@ -70,7 +70,7 @@ PROCEDURE GUIReader( oGet, oGetlist, oMenu, aMsg ) IF !ISOBJECT( oGetList ) oGetList := __GetListActive() ENDIF - + IF oGetList != NIL oGetlist:GUIReader( oGet, oMenu, aMsg ) ENDIF @@ -121,7 +121,7 @@ PROCEDURE TBApplyKey( oGet, oTB, oGetList, nKey, aMsg ) oGetList:TBApplyKey( oGet, oTB, nKey, aMsg ) ENDIF - RETURN + RETURN FUNCTION Accelerator( oGetList, nKey, aMsg ) diff --git a/harbour/source/rtl/gtapiu.c b/harbour/source/rtl/gtapiu.c index ad3b449063..7e97119fb6 100644 --- a/harbour/source/rtl/gtapiu.c +++ b/harbour/source/rtl/gtapiu.c @@ -158,4 +158,3 @@ USHORT hb_gtSetBorder( HB_GT_RGB * color ) return 1; } - diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c index c8960c9c01..623a8b2176 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.c +++ b/harbour/source/rtl/gtcrs/gtcrs.c @@ -1756,7 +1756,7 @@ static int gt_resize( InOutBase * ioBase ) if ( gt_getsize( ioBase, &rows, &cols ) >= 0 ) { /* -#if defined(NCURSES_VERSION) +#if defined( NCURSES_VERSION ) wresize( ioBase->stdscr, rows, cols ); #endif */ @@ -1764,7 +1764,7 @@ static int gt_resize( InOutBase * ioBase ) gt_refresh( ioBase ); ret = 0; /* -#if defined(NCURSES_VERSION) +#if defined( NCURSES_VERSION ) if ( resize_term( rows, cols ) == OK ) { ret = 0; gt_refresh( ioBase ); @@ -3024,7 +3024,7 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) /* *********************************************************************** */ -#if defined(HB_GT_CRS_BCEHACK) && defined(NCURSES_VERSION) && !defined(HB_NCURSES_194) +#if defined( HB_GT_CRS_BCEHACK ) && defined( NCURSES_VERSION ) && !defined( HB_NCURSES_194 ) #include static void curs_wrkaround( void ) { diff --git a/harbour/source/rtl/gtcrs/gtcrs.h b/harbour/source/rtl/gtcrs/gtcrs.h index 5bb358f06a..f9d097ff22 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.h +++ b/harbour/source/rtl/gtcrs/gtcrs.h @@ -98,7 +98,7 @@ #include #include #include -#if ( defined( HB_OS_LINUX ) || defined( HB_OS_BSD ) ) && !defined(__WATCOMC__) +#if ( defined( HB_OS_LINUX ) || defined( HB_OS_BSD ) ) && !defined( __WATCOMC__ ) # if defined( HB_OS_LINUX ) # include /* for openpty and forkpty */ # elif defined( HB_OS_DARWIN ) || defined( __NetBSD__ ) || defined( __OpenBSD__ ) diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c index ef3d755869..06a3424ac1 100644 --- a/harbour/source/rtl/gtdos/gtdos.c +++ b/harbour/source/rtl/gtdos/gtdos.c @@ -107,29 +107,29 @@ * add other compilers for which calling real mode * interrupts with memory pointer is implemented. */ -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) #define HB_MOUSE_SAVE #endif -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) #include #include #include #include -#elif defined(_MSC_VER) || defined(__WATCOMC__) +#elif defined( _MSC_VER ) || defined( __WATCOMC__ ) #include #endif /* For screen support */ -#if defined(__POWERC) || (defined(__TURBOC__) && !defined(__BORLANDC__)) || (defined(__ZTC__) && !defined(__SC__)) +#if defined( __POWERC ) || ( defined( __TURBOC__ ) && !defined( __BORLANDC__ ) ) || ( defined( __ZTC__ ) && !defined( __SC__ ) ) #define FAR far -#elif defined(HB_OS_DOS) && !defined(__DJGPP__) && !defined(__RSX32__) && !defined(__WATCOMC__) +#elif defined( HB_OS_DOS ) && !defined( __DJGPP__ ) && !defined( __RSX32__ ) && !defined( __WATCOMC__ ) #define FAR _far #else #define FAR #endif -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) #ifndef MK_FP #define MK_FP( seg, off ) \ ((void FAR *)(((unsigned long)(seg) << 16)|(unsigned)(off))) @@ -137,10 +137,10 @@ static unsigned char FAR * s_pScreenAddres; #endif -#if defined(__WATCOMC__) && defined(__386__) +#if defined( __WATCOMC__ ) && defined( __386__ ) #define HB_PEEK_BYTE(s,o) ( *( ( UCHAR * ) ( ( (s) << 4 ) | (o) ) ) ) #define HB_POKE_BYTE(s,o,b) *( ( UCHAR * ) ( ( (s) << 4 ) | (o) ) ) = (b) -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) #define HB_PEEK_BYTE(s,o) _farpeekb( (s), (o) ) #define HB_POKE_BYTE(s,o,b) _farpokeb( (s), (o), (b) ) #else @@ -166,7 +166,7 @@ static BYTE s_charTransRev[ 256 ]; static BYTE s_charTrans[ 256 ]; static BYTE s_keyTrans[ 256 ]; -#if defined(__RSX32__) +#if defined( __RSX32__ ) static int kbhit( void ) { union REGS regs; @@ -178,8 +178,8 @@ static int kbhit( void ) } #endif -#if !defined(__DJGPP__) && !defined(__RSX32__) -#if defined(__WATCOMC__) || defined(_MSC_VER) +#if !defined( __DJGPP__ ) && !defined( __RSX32__ ) +#if defined( __WATCOMC__ ) || defined( _MSC_VER ) static void hb_gt_dos_CtrlBreak_Handler( int iSignal ) { /* Ctrl-Break was pressed */ @@ -202,9 +202,9 @@ static void hb_gt_dos_CtrlBrkRestore( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_CtrlBrkRestore()")); -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) signal( SIGBREAK, SIG_DFL ); -#elif defined(_MSC_VER) +#elif defined( _MSC_VER ) signal( SIGINT, SIG_DFL ); #else setcbrk( s_iOldCtrlBreak ); @@ -216,9 +216,9 @@ static int hb_gt_dos_GetScreenMode( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_GetScreenMode()")); -#if defined(__WATCOMC__) && defined(__386__) +#if defined( __WATCOMC__ ) && defined( __386__ ) return ( int ) *( ( unsigned char * ) 0x0449 ); -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) return ( int ) _farpeekb( 0x0040, 0x0049 ); #else return ( int ) *( ( unsigned char FAR * ) MK_FP( 0x0040, 0x0049 ) ); @@ -229,10 +229,10 @@ static void hb_gt_dos_GetScreenSize( int * piRows, int * piCols ) { HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_GetScreenSize(%p, %p)", piRows, piCols)); -#if defined(__WATCOMC__) && defined(__386__) +#if defined( __WATCOMC__ ) && defined( __386__ ) *piRows = ( int ) *( ( unsigned char * ) 0x0484 ) + 1; *piCols = ( int ) *( ( unsigned char * ) 0x044A ); -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) *piRows = ( int ) _farpeekb( 0x0040, 0x0084 ) + 1; *piCols = ( int ) _farpeekb( 0x0040, 0x004A ); #else @@ -241,14 +241,14 @@ static void hb_gt_dos_GetScreenSize( int * piRows, int * piCols ) #endif } -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) static char FAR * hb_gt_dos_ScreenAddress( PHB_GT pGT ) { char FAR * ptr; HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_ScreenAddress(%p)", pGT)); - #if defined(__WATCOMC__) && defined(__386__) + #if defined( __WATCOMC__ ) && defined( __386__ ) if( HB_GTSELF_ISCOLOR( pGT ) ) ptr = ( char * ) ( 0xB800 << 4 ); else @@ -275,7 +275,7 @@ static void hb_gt_dos_GetScreenContents( PHB_GT pGT ) { int iRow, iCol; BYTE bAttr, bChar; -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) BYTE * pScreenPtr = s_pScreenAddres; #endif @@ -285,12 +285,12 @@ static void hb_gt_dos_GetScreenContents( PHB_GT pGT ) { for( iCol = 0; iCol < s_iCols; ++iCol ) { -#if defined(__DJGPP__TEXT) +#if defined( __DJGPP__TEXT ) short ch_attr; gettext( iCol + 1, iRow + 1, iCol + 1, iRow + 1, &ch_attr ); bChar = ch_attr & 0xFF; bAttr = ch_attr >> 8; -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) int iChar, iAttr; ScreenGetChar( &iChar, &iAttr, iCol, iRow ); bAttr = iAttr; @@ -779,23 +779,23 @@ static void hb_gt_dos_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil /* Set the Ctrl+Break handler [vszakats] */ -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) gppconio_init(); __djgpp_hwint_flags |= 2; /* Count Ctrl+Break instead of killing program */ __djgpp_set_ctrl_c( 0 ); /* Disable Ctrl+C */ __djgpp_set_sigquit_key( 0 ); /* Disable Ctrl+\ */ -#elif defined(__RSX32__) +#elif defined( __RSX32__ ) /* TODO */ -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) signal( SIGBREAK, hb_gt_dos_CtrlBreak_Handler ); atexit( hb_gt_dos_CtrlBrkRestore ); -#elif defined(_MSC_VER) +#elif defined( _MSC_VER ) signal( SIGINT, hb_gt_dos_CtrlBreak_Handler ); atexit( hb_gt_dos_CtrlBrkRestore ); @@ -814,7 +814,7 @@ static void hb_gt_dos_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil HB_GTSELF_SETKEYCP( pGT, NULL, NULL ); s_iScreenMode = hb_gt_dos_GetScreenMode(); -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) s_pScreenAddres = hb_gt_dos_ScreenAddress( pGT ); #endif hb_gt_dos_GetScreenSize( &s_iRows, &s_iCols ); @@ -841,7 +841,7 @@ static int hb_gt_dos_ReadKey( PHB_GT pGT, int iEventMask ) HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_ReadKey(%p,%d)", pGT, iEventMask)); -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) /* Check to see if Ctrl+Break has been detected */ if( __djgpp_cbrk_count ) { @@ -860,7 +860,7 @@ static int hb_gt_dos_ReadKey( PHB_GT pGT, int iEventMask ) else if( kbhit() ) { /* A key code is available in the BIOS keyboard buffer, so read it */ -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) if( iEventMask & INKEY_RAW ) ch = getxkey(); else ch = getkey(); if( ch == 256 ) @@ -914,9 +914,9 @@ static BOOL hb_gt_dos_GetBlink( PHB_GT pGT ) HB_SYMBOL_UNUSED( pGT ); -#if defined(__WATCOMC__) && defined(__386__) +#if defined( __WATCOMC__ ) && defined( __386__ ) return ( *( ( char * ) 0x0465 ) & 0x10 ) != 0; -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) return ( _farpeekb( 0x0040, 0x0065 ) & 0x10 ) != 0; #else return ( *( ( char FAR * ) MK_FP( 0x0040, 0x0065 ) ) &0x10 ) != 0; @@ -946,18 +946,18 @@ static void hb_gt_dos_Tone( PHB_GT pGT, double dFrequency, double dDuration ) dFrequency = HB_MIN( HB_MAX( 0.0, dFrequency ), 32767.0 ); -#if defined(__BORLANDC__) || defined(__WATCOMC__) +#if defined( __BORLANDC__ ) || defined( __WATCOMC__ ) sound( ( unsigned ) dFrequency ); -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) sound( ( int ) dFrequency ); #endif /* convert Clipper (DOS) timer tick units to seconds ( x / 18.2 ) */ hb_idleSleep( dDuration / 18.2 ); -#if defined(__BORLANDC__) || defined(__WATCOMC__) +#if defined( __BORLANDC__ ) || defined( __WATCOMC__ ) nosound(); -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) sound( 0 ); #endif } @@ -977,15 +977,15 @@ static const char * hb_gt_dos_Version( PHB_GT pGT, int iType ) /* some definitions */ #define INT_VIDEO 0x10 -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) #define POKE_BYTE( s, o, b ) /* Do nothing */ #define outport outportw /* Use correct function name */ -#elif defined(__RSX32__) +#elif defined( __RSX32__ ) #define inportb( p ) 0 /* Return 0 */ #define outport( p, w ) /* Do nothing */ #define outportb( p, b ) /* Do nothing */ #define POKE_BYTE( s, o, b ) (*((BYTE FAR *)MK_FP((s),(o)) )=(BYTE)(b)) -#elif defined(__WATCOMC__) +#elif defined( __WATCOMC__ ) #define outportb outp /* Use correct function name */ #define outport outpw /* Use correct function name */ #define inport inpw /* Use correct function name */ @@ -1194,7 +1194,7 @@ static BOOL hb_gt_dos_SetMode( PHB_GT pGT, int iRows, int iCols ) hb_gt_dos_GetScreenSize( &s_iRows, &s_iCols ); } s_iScreenMode = hb_gt_dos_GetScreenMode(); -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) s_pScreenAddres = hb_gt_dos_ScreenAddress( pGT ); #endif hb_gt_dos_GetCursorPosition( &s_iCurRow, &s_iCurCol ); @@ -1224,7 +1224,7 @@ static BOOL hb_gt_dos_Resume( PHB_GT pGT ) HB_TRACE(HB_TR_DEBUG, ("hb_gt_dos_Resume(%p)", pGT)); s_iScreenMode = hb_gt_dos_GetScreenMode(); -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) s_pScreenAddres = hb_gt_dos_ScreenAddress( pGT ); #endif hb_gt_dos_GetScreenSize( &s_iRows, &s_iCols ); @@ -1322,7 +1322,7 @@ static BOOL hb_gt_dos_SetKeyCP( PHB_GT pGT, const char *pszTermCDP, const char * static void hb_gt_dos_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize ) { -#if !defined(__DJGPP__) +#if !defined( __DJGPP__ ) USHORT FAR *pScreenPtr = (USHORT FAR *) hb_gt_dos_ScreenPtr( iRow, iCol ); #endif BYTE bColor, bAttr; @@ -1336,12 +1336,12 @@ static void hb_gt_dos_Redraw( PHB_GT pGT, int iRow, int iCol, int iSize ) if( !HB_GTSELF_GETSCRCHAR( pGT, iRow, iCol + iLen, &bColor, &bAttr, &usChar ) ) break; -#if defined(__DJGPP__TEXT) +#if defined( __DJGPP__TEXT ) { short ch_attr = ( ( short ) bColor << 8 ) | s_charTrans[ usChar & 0xff ]; puttext( iCol + iLen + 1, iRow + 1, iCol + iLen + 1, iRow + 1, &ch_attr ); } -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) ScreenPutChar( s_charTrans[ usChar & 0xff ], bColor, iCol + iLen, iRow ); #else *pScreenPtr++ = ( bColor << 8 ) + s_charTrans[ usChar & 0xff ]; diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c index 7968a2d612..cd68fad633 100644 --- a/harbour/source/rtl/gtos2/gtos2.c +++ b/harbour/source/rtl/gtos2/gtos2.c @@ -113,7 +113,7 @@ /* convert 16:16 address to 0:32 */ #define SELTOFLAT(ptr) (void *)(((((ULONG)(ptr))>>19)<<16)|(0xFFFF&((ULONG)(ptr)))) -#if defined(HB_OS_OS2_GCC) +#if defined( HB_OS_OS2_GCC ) /* 25/03/2000 - maurilio.longo@libero.it OS/2 GCC hasn't got ToolKit headers available */ #include diff --git a/harbour/source/rtl/gtsln/gtsln.h b/harbour/source/rtl/gtsln/gtsln.h index 28695a827b..05b9aa91fb 100644 --- a/harbour/source/rtl/gtsln/gtsln.h +++ b/harbour/source/rtl/gtsln/gtsln.h @@ -65,7 +65,7 @@ #include "hbapicdp.h" #include "hbdate.h" -#if defined(HB_OS_DARWIN) || ( defined(HB_OS_LINUX) && defined(__WATCOMC__) ) +#if defined( HB_OS_DARWIN ) || ( defined( HB_OS_LINUX ) && defined( __WATCOMC__ ) ) #define REAL_UNIX_SYSTEM /* this is for slang.h to include some defs */ #endif #include @@ -116,7 +116,7 @@ #define HB_SLN_IS_CHAR( slch ) ( (slch).wchars[ 0 ] != 0 ) -#else /* !defined(HB_SLN_UTF8) */ +#else /* !defined( HB_SLN_UTF8 ) */ #if SLANG_VERSION < 10400 typedef unsigned short SLsmg_Char_Type; diff --git a/harbour/source/rtl/gtsln/kbsln.c b/harbour/source/rtl/gtsln/kbsln.c index f0af95c264..0e7d4d90da 100644 --- a/harbour/source/rtl/gtsln/kbsln.c +++ b/harbour/source/rtl/gtsln/kbsln.c @@ -63,19 +63,19 @@ #endif /* we're assuming target has termios - should be better done */ -#include +#include /* *********************************************************************** */ /* keyboard states - these should be taken from system includes, not be hard coded */ -#if defined(__linux__) +#if defined( __linux__ ) #define SHIFT_PRESSED 1 #define ALTR_PRESSED 2 #define CONTROL_PRESSED 4 #define ALTL_PRESSED 8 #define ALT_PRESSED ALTL_PRESSED -#elif defined(M_UNIX) /* SCO */ +#elif defined( M_UNIX ) /* SCO */ #define SHIFT_PRESSED 1 #define ALTR_PRESSED 8 #define CONTROL_PRESSED 2 @@ -93,7 +93,7 @@ #define MOUSE_ALL_EVENTS_MASK \ ( INKEY_MOVE | INKEY_LDOWN | INKEY_LUP | INKEY_RDOWN | INKEY_RUP ) - + /* extra keysyms definitions */ #define SL_KEY_NUM_5 SL_KEY_B2 /* this is checked explicitly */ #define SL_KEY_MAX ( ( unsigned int ) 0x2000 ) @@ -138,14 +138,14 @@ static int hb_sln_try_get_Kbd_State( void ); static void hb_sln_Init_TermType() { char * Env; - + /* an uncertain way to check if we run under linux console */ Env = hb_getenv( "TERM" ); if( Env ) { hb_sln_UnderLinuxConsole = *Env && ( strncmp( Env, "linux", 5 ) == 0 ); hb_xfree( ( void * ) Env ); - } + } /* an uncertain way to check if we run under xterm */ Env = hb_getenv( "TERM" ); if( Env ) @@ -163,7 +163,7 @@ static void hb_sln_Init_KeyTranslations() char ch, keyname[ SLANG_MAX_KEYMAP_KEY_SEQ + 1 ]; int keynum, i; char * keyseq; - + /* for defining ^[ sequences - this simulates Alt+Keys */ char AltChars[][ 2 ] = { @@ -171,11 +171,11 @@ static void hb_sln_Init_KeyTranslations() { 'A', 'Z' }, { 'a', 'z' } }; - + /* on Unix systems ESC is a special key so let assume ESC is a doble pressed ESC key */ SLkp_define_keysym( ( char * ) "^[^[", SL_KEY_ESC ); - + /* try to define Shft-Fn and Ctrl-Fn keys. Because we assume terminal has only 10 Fkeys so F11-F30 is generated with Shift & Ctrl. @@ -183,7 +183,7 @@ static void hb_sln_Init_KeyTranslations() keynum = 11; keyname[ 0 ] = 'F'; keyname[ 2 ] = 0; - + /* Shft & Ctrl FKeys definition takes place in two phases : from '1' to '9' and from 'A' to 'K' */ for( i = 1; i <= 2; i++ ) @@ -197,14 +197,14 @@ static void hb_sln_Init_KeyTranslations() keynum++; } } - + /* We assume Esc key is a Meta key which is treated as an Alt key. Also pressing Alt+Key on linux console and linux xterm gives the same key sequences as with Meta key so we are happy */ - + keyname[ 0 ] = 033; keyname[ 2 ] = 0; - + /* Alt+Letter & Alt+digit definition takes place in three phases : from '0' to '9', from 'A' to 'Z' and from 'a' to 'z' */ for( i = 0; i < 3; i++ ) @@ -213,14 +213,14 @@ static void hb_sln_Init_KeyTranslations() { /* fprintf( stderr, "%d %c\n", i, ch ); */ keyname[ 1 ] = ch; - + /* QUESTION: why Slang reports error for defining Alt+O ???. Have I any hidden error in key definitiions ??? */ if( ch != 'O' ) SLkp_define_keysym( keyname, SL_KEY_ALT( ch ) ); } } - + /* mouse events under xterm */ if( hb_sln_UnderXterm ) { @@ -231,7 +231,7 @@ static void hb_sln_Init_KeyTranslations() SLkp_define_keysym( keyseq, SL_KEY_MOU ); } } - + /* five on numeric console */ /* SLkp_define_keysym( "^[[G", SL_KEY_NUM_5 ); */ } @@ -268,7 +268,7 @@ int hb_sln_Init_Terminal( int phase ) } if( p ) hb_xfree( ( void * ) p ); - + /* number of keys dealing with a Dead key */ hb_sln_convKDeadKeys[ 0 ] = 0; } @@ -460,19 +460,19 @@ int hb_gt_sln_ReadKey( PHB_GT pGT, int iEventMask ) static int hb_sln_try_get_Kbd_State( void ) { -#if defined(__linux__) +#if defined( __linux__ ) unsigned char modifiers = 6; if( ioctl( 0, TIOCLINUX, &modifiers ) < 0 ) return 0; - + return ( int ) modifiers; - -#elif defined(M_UNIX) - + +#elif defined( M_UNIX ) + int modifiers = 0; int IOcommand = 0; - + if( ioctl( 0, TCGETSC, &IOcommand ) >= 0 ) { /* if keyboard is not in SCANCODE mode */ @@ -485,7 +485,7 @@ static int hb_sln_try_get_Kbd_State( void ) /* if SCANCODE mode is set corectly try get KBD state */ if( ioctl( 0, KDGKBSTATE, &modifiers ) < 0 ) modifiers = 0; - + /* turn a keyboard to a normal mode ( translation mode ) */ IOcommand = KB_XSCANCODE; ( void ) ioctl( 0, TCSETSC, &IOcommand ) diff --git a/harbour/source/rtl/gtsln/mousesln.c b/harbour/source/rtl/gtsln/mousesln.c index 941e0c96b6..8d5b8f5d5f 100644 --- a/harbour/source/rtl/gtsln/mousesln.c +++ b/harbour/source/rtl/gtsln/mousesln.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * Mouse subsystem for gtsln + * Mouse subsystem for gtsln * * Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu) * www - http://www.harbour-project.org @@ -88,17 +88,17 @@ static BOOL GetGpmEvent( Gpm_Event *Evt ) struct timeval tv = { 0, 0 }; fd_set ReadFD; - FD_ZERO( &ReadFD ); + FD_ZERO( &ReadFD ); FD_SET( gpm_fd, &ReadFD ); if( select( gpm_fd+1, &ReadFD, NULL, NULL, &tv ) > 0 ) - if( FD_ISSET( gpm_fd, &ReadFD ) ) + if( FD_ISSET( gpm_fd, &ReadFD ) ) return Gpm_GetEvent( Evt ) > 0; } return FALSE; } -#endif +#endif /* *********************************************************************** */ @@ -119,7 +119,7 @@ static BOOL GetXtermEvent( int *Btn, int *Col, int *Row ) } } } - + return FALSE; } @@ -361,7 +361,7 @@ void hb_gt_sln_mouse_Init( void ) #endif Conn.eventMask = GPM_MOVE | GPM_UP | GPM_DOWN | GPM_DRAG | GPM_DOUBLE; /* give me move events but handle them anyway */ - Conn.defaultMask= GPM_MOVE | GPM_HARD; + Conn.defaultMask= GPM_MOVE | GPM_HARD; /* only pure mouse events, no Ctrl,Alt,Shft events */ Conn.minMod = 0; Conn.maxMod = 0; gpm_zerobased = 1; gpm_visiblepointer = 1; @@ -381,7 +381,7 @@ void hb_gt_sln_mouse_Init( void ) /* * In recent GPM versions it produce unpleasure noice on the screen * so I covered it with this macro, [druzus] - */ + */ #ifdef HB_GPM_USE_XTRA s_iMouseButtons = Gpm_GetSnapshot( NULL ); #else diff --git a/harbour/source/rtl/gtsys.c b/harbour/source/rtl/gtsys.c index 6c1864db05..1178b7de7e 100644 --- a/harbour/source/rtl/gtsys.c +++ b/harbour/source/rtl/gtsys.c @@ -59,17 +59,17 @@ #include "hbgtcore.h" -#if defined(HB_GT_LIB) +#if defined( HB_GT_LIB ) HB_GT_REQUEST( HB_GT_LIB ) -#elif defined(HB_OS_WIN_CE) +#elif defined( HB_OS_WIN_CE ) HB_GT_REQUEST( WVT ) -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) HB_GT_REQUEST( WIN ) -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) HB_GT_REQUEST( DOS ) -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) HB_GT_REQUEST( OS2 ) -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) HB_GT_REQUEST( TRM ) #else HB_GT_REQUEST( STD ) diff --git a/harbour/source/rtl/gttone.c b/harbour/source/rtl/gttone.c index aeb9279bdc..82ad2d155f 100644 --- a/harbour/source/rtl/gttone.c +++ b/harbour/source/rtl/gttone.c @@ -67,10 +67,10 @@ #if defined( HB_OS_WIN ) #if defined( HB_ARCH_32BIT ) && !defined( _M_ARM ) && \ - ( defined(__BORLANDC__) || defined(_MSC_VER) || \ - defined(__WATCOMC__) || defined(__MINGW32__) ) + ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || \ + defined( __WATCOMC__ ) || defined( __MINGW32__ ) ) -#if defined(_MSC_VER) || defined(__WATCOMC__) +#if defined( _MSC_VER ) || defined( __WATCOMC__ ) #include #endif @@ -80,7 +80,7 @@ static int hb_Inp9x( USHORT usPort ) HB_TRACE(HB_TR_DEBUG, ("hb_Inp9x(%hu)", usPort)); - #if defined( __BORLANDC__ ) || defined(__DMC__) + #if defined( __BORLANDC__ ) || defined( __DMC__ ) _DX = usPort; __emit__(0xEC); /* ASM IN AL, DX */ @@ -118,7 +118,7 @@ static int hb_Outp9x( USHORT usPort, USHORT usVal ) { HB_TRACE(HB_TR_DEBUG, ("hb_Outp9x(%hu, %hu)", usPort, usVal)); - #if defined( __BORLANDC__ ) || defined(__DMC__) + #if defined( __BORLANDC__ ) || defined( __DMC__ ) _DX = usPort; _AL = usVal; @@ -256,7 +256,7 @@ void hb_gt_winapi_tone( double dFrequency, double dDuration ) { #if defined( HB_ARCH_32BIT ) && !defined( _M_ARM ) && \ ( defined( __BORLANDC__ ) || defined( _MSC_VER ) || \ - defined( __WATCOMC__ ) || defined(__MINGW32__) ) + defined( __WATCOMC__ ) || defined( __MINGW32__ ) ) hb_gt_w9xTone( dFrequency, dDuration ); #else hb_gt_wNtTone( dFrequency, dDuration ); diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index dba97da4b2..7eafe8871b 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -94,7 +94,7 @@ # include #endif -#if defined( _MSC_VER ) || defined(__WATCOMC__) +#if defined( _MSC_VER ) || defined( __WATCOMC__ ) # include #endif @@ -109,11 +109,11 @@ static BOOL b_MouseEnable = TRUE; /* *********************************************************************** */ -#if defined(__IBMCPP__) +#if defined( __IBMCPP__ ) #undef WORD /* 2 bytes unsigned */ typedef unsigned short int WORD; #else - #if ! defined(HB_DONT_DEFINE_BASIC_TYPES) + #if ! defined( HB_DONT_DEFINE_BASIC_TYPES ) #undef WORD /* 2 bytes unsigned */ typedef USHORT WORD; @@ -122,11 +122,11 @@ static BOOL b_MouseEnable = TRUE; #endif #endif -#if ! defined(__GNUC__) && defined(__CYGWIN__) +#if ! defined( __GNUC__ ) && defined( __CYGWIN__ ) typedef WORD far * LPWORD; #endif -#if defined(__RSXNT__) +#if defined( __RSXNT__ ) #ifndef FROM_LEFT_1ST_BUTTON_PRESSED #define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001 #endif diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index b9733ce396..f55bfaed59 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -693,7 +693,7 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT ) pWVT->PTEXTSIZE.x = tm.tmAveCharWidth; pWVT->PTEXTSIZE.y = tm.tmHeight; -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) pWVT->FixedFont = FALSE; #else pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 && @@ -743,7 +743,7 @@ static void hb_gt_wvt_Maximize( PHB_GTWVT pWVT ) hb_gt_wvt_FitRows( pWVT ); /* Disable "maximize" button */ -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, _WVT_WS_MAXED ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, _WVT_WS_MAXED ); @@ -811,7 +811,7 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT ) tm.tmAveCharWidth; /* For fixed FONT should == tm.tmMaxCharWidth */ pWVT->PTEXTSIZE.y = tm.tmHeight; /* but seems to be a problem on Win9X so */ /* assume proportional fonts always for Win9X */ -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) pWVT->FixedFont = FALSE; #else pWVT->FixedFont = !pWVT->Win9X && pWVT->fontWidth >= 0 && @@ -1118,7 +1118,7 @@ static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, L rect.right != pWVT->sRectOld.right || rect.bottom != pWVT->sRectOld.bottom ) { -#if !defined(HB_OS_WIN_CE) /* WinCE does not support InvertRgn */ +#if !defined( HB_OS_WIN_CE ) /* WinCE does not support InvertRgn */ /* Concept forwarded by Andy Wos - thanks. */ HRGN rgn1 = CreateRectRgn( pWVT->sRectOld.left, pWVT->sRectOld.top, pWVT->sRectOld.right, pWVT->sRectOld.bottom ); HRGN rgn2 = CreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); @@ -1692,7 +1692,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara /* Enable "maximize" button */ -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, _WVT_WS_DEF ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, _WVT_WS_DEF ); @@ -1730,7 +1730,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara } return 0; -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) case WM_NCLBUTTONDBLCLK: if( !pWVT->bMaximized ) { @@ -1832,12 +1832,12 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT ) if( !pWVT->hWnd ) hb_errInternal( 10001, "Failed to create WVT window", NULL, NULL ); -#if ! defined(HB_OS_WIN_CE) +#if ! defined( HB_OS_WIN_CE ) if( ! GetSystemMetrics( SM_REMOTESESSION ) ) { typedef BOOL ( WINAPI * P_SLWA )( HWND, COLORREF, BYTE, DWORD ); -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) P_SLWA pSetLayeredWindowAttributes = ( P_SLWA ) GetProcAddress( GetModuleHandle( TEXT( "user32.dll" ) ), TEXT( "SetLayeredWindowAttributes" ) ); @@ -1849,7 +1849,7 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT ) if( pSetLayeredWindowAttributes ) { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_EXSTYLE, GetWindowLong( pWVT->hWnd, GWL_EXSTYLE ) | WS_EX_LAYERED ); #else SetWindowLongPtr( pWVT->hWnd, GWL_EXSTYLE, GetWindowLongPtr( pWVT->hWnd, GWL_EXSTYLE ) | WS_EX_LAYERED ); @@ -2547,7 +2547,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->bResizable = bNewValue; if( pWVT->hWnd ) { -#if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_OS_WIN_CE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT) +#if ( defined( _MSC_VER ) && ( _MSC_VER <= 1200 || defined( HB_OS_WIN_CE ) ) || defined( __DMC__ ) ) && !defined( HB_ARCH_64BIT ) SetWindowLong( pWVT->hWnd, GWL_STYLE, pWVT->bResizable ? _WVT_WS_DEF : _WVT_WS_NORESIZE ); #else SetWindowLongPtr( pWVT->hWnd, GWL_STYLE, pWVT->bResizable ? _WVT_WS_DEF : _WVT_WS_NORESIZE ); @@ -2578,7 +2578,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) pWVT->pszSelectCopy = hb_strdup( hb_itemGetCPtr( pInfo->pNewVal ) ); pWVT->bSelectCopy = TRUE; -#if !defined(HB_OS_WIN_CE) /* WinCE does not support ModifyMenu */ +#if !defined( HB_OS_WIN_CE ) /* WinCE does not support ModifyMenu */ if( hSysMenu ) { LPTSTR buffer; diff --git a/harbour/source/rtl/gui.prg b/harbour/source/rtl/gui.prg index b539c6932f..76fe34cd1e 100644 --- a/harbour/source/rtl/gui.prg +++ b/harbour/source/rtl/gui.prg @@ -67,8 +67,8 @@ FUNCTION _SetVideoMode( nMode ) RETURN 0 -/* NOTE: Original _GetNumCol() will not recognize colors written - in lowercase. We're replicating this behaviour in this +/* NOTE: Original _GetNumCol() will not recognize colors written + in lowercase. We're replicating this behaviour in this compatibility function. [vszakats] */ FUNCTION _GetNumCol( cColor ) @@ -88,7 +88,7 @@ FUNCTION __GUIColor( cColor, nPos ) FUNCTION IsDefColor() RETURN SetColor() == "W/N,N/W,N/N,N/N,N/W" /* NOTE: Color must match with the one in set.c */ - + /* Removes the accelerator marker from a caption string */ FUNCTION __Caption( cCaption ) LOCAL nPos diff --git a/harbour/source/rtl/hbbit.c b/harbour/source/rtl/hbbit.c index 357ffa34f9..b420439bc7 100644 --- a/harbour/source/rtl/hbbit.c +++ b/harbour/source/rtl/hbbit.c @@ -54,9 +54,9 @@ #include "hbapierr.h" /* NOTE: IMPORTANT: - hb_bit*() Harbour level function names and logic are embedded - in the compiler optimization engine, so in any case these - function have to be changed, updated or extended, don't forget + hb_bit*() Harbour level function names and logic are embedded + in the compiler optimization engine, so in any case these + function have to be changed, updated or extended, don't forget to update the references in the compiler as well. [vszakats] */ diff --git a/harbour/source/rtl/hbffind.c b/harbour/source/rtl/hbffind.c index d4e75812ff..de38d740f8 100644 --- a/harbour/source/rtl/hbffind.c +++ b/harbour/source/rtl/hbffind.c @@ -68,21 +68,21 @@ /* ------------------------------------------------------------- */ -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) - #if defined(__DJGPP__) || defined(__RSX32__) + #if defined( __DJGPP__ ) || defined( __RSX32__ ) #include #endif - #if defined(__DJGPP__) || defined(__RSX32__) || defined(__BORLANDC__) + #if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __BORLANDC__ ) #include #endif #include -#if !defined(__WATCOMC__) +#if !defined( __WATCOMC__ ) #include #endif #include -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) typedef struct { struct find_t entry; @@ -105,7 +105,7 @@ } HB_FFIND_INFO, * PHB_FFIND_INFO; #endif -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) #include #include @@ -120,7 +120,7 @@ ULONG findCount; } HB_FFIND_INFO, * PHB_FFIND_INFO; -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) typedef struct { @@ -135,7 +135,7 @@ ( ( info->dwAttr & info->pFindFileData.dwFileAttributes & ( FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM ) ) != 0 ) \ ) -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) #include #include @@ -178,7 +178,7 @@ ULONG hb_fsAttrFromRaw( ULONG raw_attr ) HB_TRACE(HB_TR_DEBUG, ("hb_fsAttrFromRaw(%lu)", raw_attr)); -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) ulAttr = 0; if( raw_attr & FA_ARCH ) ulAttr |= HB_FA_ARCHIVE; @@ -188,7 +188,7 @@ ULONG hb_fsAttrFromRaw( ULONG raw_attr ) if( raw_attr & FA_LABEL ) ulAttr |= HB_FA_LABEL; if( raw_attr & FA_SYSTEM ) ulAttr |= HB_FA_SYSTEM; -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) ulAttr = 0; if( raw_attr & FILE_ARCHIVED ) ulAttr |= HB_FA_ARCHIVE; @@ -197,7 +197,7 @@ ULONG hb_fsAttrFromRaw( ULONG raw_attr ) if( raw_attr & FILE_READONLY ) ulAttr |= HB_FA_READONLY; if( raw_attr & FILE_SYSTEM ) ulAttr |= HB_FA_SYSTEM; -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) ulAttr = 0; if( raw_attr & FILE_ATTRIBUTE_ARCHIVE ) ulAttr |= HB_FA_ARCHIVE; @@ -221,7 +221,7 @@ ULONG hb_fsAttrFromRaw( ULONG raw_attr ) if( raw_attr & 0x00002000 ) ulAttr |= HB_FA_NOTINDEXED; if( raw_attr & 0x00008000 ) ulAttr |= HB_FA_VOLCOMP; -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) ulAttr = ( ( raw_attr & S_IXOTH ) ? HB_FA_XOTH : 0 ) | ( ( raw_attr & S_IWOTH ) ? HB_FA_WOTH : 0 ) | @@ -260,7 +260,7 @@ ULONG hb_fsAttrToRaw( ULONG ulAttr ) HB_TRACE(HB_TR_DEBUG, ("hb_fsAttrToRaw(%lu)", ulAttr)); -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) raw_attr = 0; if( ulAttr & HB_FA_ARCHIVE ) raw_attr |= FA_ARCH; @@ -270,7 +270,7 @@ ULONG hb_fsAttrToRaw( ULONG ulAttr ) if( ulAttr & HB_FA_LABEL ) raw_attr |= FA_LABEL; if( ulAttr & HB_FA_SYSTEM ) raw_attr |= FA_SYSTEM; -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) raw_attr = 0; if( ulAttr & HB_FA_ARCHIVE ) raw_attr |= FILE_ARCHIVED; @@ -279,7 +279,7 @@ ULONG hb_fsAttrToRaw( ULONG ulAttr ) if( ulAttr & HB_FA_READONLY ) raw_attr |= FILE_READONLY; if( ulAttr & HB_FA_SYSTEM ) raw_attr |= FILE_SYSTEM; -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) raw_attr = 0; @@ -302,7 +302,7 @@ ULONG hb_fsAttrToRaw( ULONG ulAttr ) if( ulAttr & HB_FA_NOTINDEXED ) raw_attr |= 0x00002000; /* FILE_ATTRIBUTE_NOT_CONTENT_INDEXED not defined in some older winnt.h */ if( ulAttr & HB_FA_VOLCOMP ) raw_attr |= 0x00008000; -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) raw_attr = HB_FA_POSIX_ATTR( ulAttr ); @@ -405,7 +405,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) hb_vmUnlock(); -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) { PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info; @@ -419,7 +419,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) /* tzset(); */ -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) bFound = ( _dos_findfirst( ffind->pszFileMask, ( USHORT ) hb_fsAttrToRaw( ffind->attrmask ), &info->entry ) == 0 ); #else bFound = ( findfirst( ffind->pszFileMask, &info->entry, ( USHORT ) hb_fsAttrToRaw( ffind->attrmask ) ) == 0 ); @@ -427,7 +427,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) } else { -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) bFound = ( _dos_findnext( &info->entry ) == 0 ); #else bFound = ( findnext( &info->entry ) == 0 ); @@ -465,7 +465,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) hb_fsSetIOError( bFound, 0 ); } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info; @@ -515,7 +515,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) hb_fsSetIOError( bFound, 0 ); } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) { PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info; @@ -567,7 +567,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) ffind->size = 0; else { -#if defined(__XCC__) || (defined(__POCC__) && __POCC__ >= 500) +#if defined( __XCC__ ) || ( defined( __POCC__ ) && __POCC__ >= 500 ) /* NOTE: PellesC 5.00.1 will go into an infinite loop if we don't split this into two operations. [vszakats] */ ffind->size = ( HB_FOFFSET ) info->pFindFileData.nFileSizeLow; @@ -603,7 +603,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) hb_fsSetIOError( bFound, 0 ); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) { PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info; @@ -811,15 +811,15 @@ void hb_fsFindClose( PHB_FFIND ffind ) hb_vmUnlock(); -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) - #if defined(__DJGPP__) || defined(__BORLANDC__) + #if defined( __DJGPP__ ) || defined( __BORLANDC__ ) { HB_SYMBOL_UNUSED( info ); } #else { -#if defined(__WATCOMC__) +#if defined( __WATCOMC__ ) _dos_findclose( &info->entry ); #else findclose( &info->entry ); @@ -827,20 +827,20 @@ void hb_fsFindClose( PHB_FFIND ffind ) } #endif -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { DosFindClose( info->hFindFile ); } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) if( info->hFindFile != INVALID_HANDLE_VALUE ) { FindClose( info->hFindFile ); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) if( info->dir ) { diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c index acc311256d..5db2a7d1b5 100644 --- a/harbour/source/rtl/hbgtcore.c +++ b/harbour/source/rtl/hbgtcore.c @@ -3097,17 +3097,17 @@ static const HB_GT_FUNCS s_gtCoreFunc = static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ]; -#if defined(HB_GT_LIB) +#if defined( HB_GT_LIB ) const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_LIB ); -#elif defined(HB_OS_WIN_CE) +#elif defined( HB_OS_WIN_CE ) const char * hb_gt_szNameDefault = "wvt"; -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) const char * hb_gt_szNameDefault = "win"; -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) const char * hb_gt_szNameDefault = "dos"; -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) const char * hb_gt_szNameDefault = "os2"; -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) const char * hb_gt_szNameDefault = "trm"; #else const char * hb_gt_szNameDefault = "std"; diff --git a/harbour/source/rtl/hbini.prg b/harbour/source/rtl/hbini.prg index 0c273e4b55..d4d361aa2c 100644 --- a/harbour/source/rtl/hbini.prg +++ b/harbour/source/rtl/hbini.prg @@ -296,7 +296,7 @@ FUNCTION hb_IniWrite( xFileName, hIni, cCommentBegin, cCommentEnd, lAutoMain ) hb_HEval( hIni[ "MAIN" ], ; { |cKey, xVal| FWrite( hFile, hb_CStr( cKey ) + " = " + ; hb_CStr( xVal ) + cNewLine ) } ) - + ELSE /* When automain is off, just write all the toplevel variables. */ hb_HEval( hIni, { |cKey, xVal| iif( ! hb_isHash( xVal ),; diff --git a/harbour/source/rtl/hbproces.c b/harbour/source/rtl/hbproces.c index c6db4b9de6..d185c28012 100644 --- a/harbour/source/rtl/hbproces.c +++ b/harbour/source/rtl/hbproces.c @@ -206,7 +206,7 @@ static int hb_fsProcessExec( const char *pszFilename, PROCESS_INFORMATION pi; STARTUPINFO si; DWORD dwFlags = 0; -#if defined(UNICODE) +#if defined( UNICODE ) LPWSTR lpCommand = hb_mbtowc( pszFilename ); #else char * lpCommand = hb_strdup( pszFilename ); @@ -401,7 +401,7 @@ HB_FHANDLE hb_fsProcessOpen( const char *pszFilename, PROCESS_INFORMATION pi; STARTUPINFO si; DWORD dwFlags = 0; -#if defined(UNICODE) +#if defined( UNICODE ) LPWSTR lpCommand = hb_mbtowc( pszFilename ); #else char * lpCommand = hb_strdup( pszFilename ); diff --git a/harbour/source/rtl/hbregexc.c b/harbour/source/rtl/hbregexc.c index 1f8e2690c3..d967aebd65 100644 --- a/harbour/source/rtl/hbregexc.c +++ b/harbour/source/rtl/hbregexc.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * www - http://www.harbour-project.org diff --git a/harbour/source/rtl/hbstrfmt.c b/harbour/source/rtl/hbstrfmt.c index 36413e107e..be911954e7 100644 --- a/harbour/source/rtl/hbstrfmt.c +++ b/harbour/source/rtl/hbstrfmt.c @@ -252,7 +252,7 @@ PHB_ITEM hb_strFormat( PHB_ITEM pItemReturn, PHB_ITEM pItemFormat, int iCount, P /* If decimals is set, zero padding flag is ignored */ if( iDec >= 0 ) fPadZero = 0; - + if( fLeftAlign ) { /* Zero padding is ignored on left Align */ @@ -266,7 +266,7 @@ PHB_ITEM hb_strFormat( PHB_ITEM pItemReturn, PHB_ITEM pItemFormat, int iCount, P for( i = iSize; i < iDec; i++ ) bufadd( &buffer, "0", 1 ); - + bufadd( &buffer, pStr2, ( ULONG ) iSize ); if( iDec > iSize ) iSize = iDec; @@ -303,10 +303,10 @@ PHB_ITEM hb_strFormat( PHB_ITEM pItemReturn, PHB_ITEM pItemFormat, int iCount, P bufadd( &buffer, "+", 1 ); else if( fSpaceSign ) bufadd( &buffer, " ", 1 ); - + for( i = iSize; i < iDec; i++ ) bufadd( &buffer, "0", 1 ); - + bufadd( &buffer, pStr2, ( ULONG ) iSize ); } } diff --git a/harbour/source/rtl/hbtoken.c b/harbour/source/rtl/hbtoken.c index c18957c2f1..a86150426f 100644 --- a/harbour/source/rtl/hbtoken.c +++ b/harbour/source/rtl/hbtoken.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * + * * * Copyright 2007 Przemyslaw Czerpak * www - http://www.harbour-project.org @@ -99,7 +99,7 @@ static const char * hb_tokenGet( const char * szLine, ULONG ulLen, { ULONG ul, ulStart; char cQuote = 0; - + for( ul = ulStart = 0; ul < ulLen; ++ul ) { if( cQuote ) diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c index 13881382ea..3d9f3a66be 100644 --- a/harbour/source/rtl/isprint.c +++ b/harbour/source/rtl/isprint.c @@ -57,7 +57,7 @@ BOOL hb_printerIsReady( const char * pszPrinterName ) { BOOL bIsPrinter; -#if defined(HB_OS_DOS) +#if defined( HB_OS_DOS ) /* NOTE: DOS specific solution, using BIOS interrupt */ @@ -95,7 +95,7 @@ BOOL hb_printerIsReady( const char * pszPrinterName ) bIsPrinter = FALSE; } -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) /* NOTE: Platform independent method, at least it will compile and run on any platform, but the result may not be the expected one, diff --git a/harbour/source/rtl/lang.c b/harbour/source/rtl/lang.c index 748c52e160..dabe5189d7 100644 --- a/harbour/source/rtl/lang.c +++ b/harbour/source/rtl/lang.c @@ -80,7 +80,7 @@ HB_FUNC( HB_USERLANG ) } else { -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) const char * ietfc; switch( GetUserDefaultLangID() ) diff --git a/harbour/source/rtl/lennum.c b/harbour/source/rtl/lennum.c index cabdd03630..cc7e88a013 100644 --- a/harbour/source/rtl/lennum.c +++ b/harbour/source/rtl/lennum.c @@ -72,4 +72,3 @@ HB_FUNC( LENNUM ) hb_retnl( ulLen ); } - diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index cc3b3ccc55..0064a646be 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -55,7 +55,7 @@ * */ -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) # include _LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_; #else @@ -69,10 +69,10 @@ _LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_; #include "hbstack.h" #include "hbmath.h" -#if defined(HB_MATH_ERRNO) +#if defined( HB_MATH_ERRNO ) # include #endif -#if defined(HB_OS_SUNOS) +#if defined( HB_OS_SUNOS ) # include #endif @@ -82,7 +82,7 @@ typedef struct PHB_ITEM block; HB_MATH_HANDLERPROC handler; HB_MATH_HANDLERPROC prevHandler; -#if defined(HB_MATH_HANDLER) +#if defined( HB_MATH_HANDLER ) HB_MATH_EXCEPTION exception; #endif } HB_MATHERRDATA, * PHB_MATHERRDATA; @@ -176,7 +176,7 @@ static void hb_mathErrDataInit( void * Cargo ) pMathErr->handler = hb_matherr; -#if defined(HB_MATH_HANDLER) +#if defined( HB_MATH_HANDLER ) pMathErr->exception.type = HB_MATH_ERR_NONE; pMathErr->exception.funcname = ""; pMathErr->exception.error = ""; @@ -216,7 +216,7 @@ void hb_mathResetError( HB_MATH_EXCEPTION * phb_exc ) HB_SYMBOL_UNUSED( phb_exc ); -#if defined(HB_MATH_HANDLER) +#if defined( HB_MATH_HANDLER ) { PHB_MATHERRDATA pMathErr = hb_mathErrData(); pMathErr->exception.type = HB_MATH_ERR_NONE; @@ -229,13 +229,13 @@ void hb_mathResetError( HB_MATH_EXCEPTION * phb_exc ) pMathErr->exception.retvaldec = -1; /* use standard SET DECIMALS */ pMathErr->exception.handled = 1; } -#elif defined(HB_MATH_ERRNO) +#elif defined( HB_MATH_ERRNO ) errno = 0; #endif } /* route C math lib errors to Harbour error handling */ -#if defined(HB_MATH_HANDLER) +#if defined( HB_MATH_HANDLER ) int matherr( struct exception *err ) { @@ -310,7 +310,7 @@ int matherr( struct exception *err ) BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, double arg1, double arg2, double dResult ) { -#if defined(HB_MATH_ERRNO) +#if defined( HB_MATH_ERRNO ) int errCode; @@ -322,7 +322,7 @@ BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, return FALSE; case EDOM: case ERANGE: -# if defined(EOVERFLOW) +# if defined( EOVERFLOW ) case EOVERFLOW: # endif errCode = errno; @@ -331,9 +331,9 @@ BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, default: if( isnan( dResult ) ) errCode = EDOM; -# if defined(HB_OS_SUNOS) +# if defined( HB_OS_SUNOS ) else if( !finite( dResult ) ) -# elif defined(HB_OS_OS2) +# elif defined( HB_OS_OS2 ) else if( !isfinite( dResult ) ) # else else if( isinf( dResult ) ) @@ -355,7 +355,7 @@ BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, phb_exc->type = HB_MATH_ERR_SING; phb_exc->error = "Calculation results in singularity"; break; -# if defined(EOVERFLOW) +# if defined( EOVERFLOW ) case EOVERFLOW: phb_exc->type = HB_MATH_ERR_OVERFLOW; phb_exc->error = "Calculation result too large to represent"; @@ -389,7 +389,7 @@ BOOL hb_mathGetError( HB_MATH_EXCEPTION * phb_exc, const char *szFunc, HB_SYMBOL_UNUSED( arg2 ); HB_SYMBOL_UNUSED( szFunc ); -# if defined(HB_MATH_HANDLER) +# if defined( HB_MATH_HANDLER ) memcpy( phb_exc, &hb_mathErrData()->exception, sizeof( HB_MATH_EXCEPTION ) ); return phb_exc->type != HB_MATH_ERR_NONE; diff --git a/harbour/source/rtl/maxrow.c b/harbour/source/rtl/maxrow.c index 7d7e10c8d9..cc201f5c0b 100644 --- a/harbour/source/rtl/maxrow.c +++ b/harbour/source/rtl/maxrow.c @@ -53,15 +53,15 @@ #include "hbapi.h" #include "hbapigt.h" -/* NOTE: This is a hack to emulate the overloaded MaxRow()/MaxCol() - functions provided by CT3 library for CA-Cl*pper. - Application code is encouraged to rather use the - hbct_MaxRow(.T.)/hbct_MaxCol(.T.) functions provided by - Harbour CT library, or hb_ScrMaxRow()/hb_ScrMaxCol() - provided by Harbour RTL, since this extension may - collide in the future with extensions of other overloaded - versions (like the one of FlagShip), and it's currently - (2008 May) the only known non-standard extension slipped +/* NOTE: This is a hack to emulate the overloaded MaxRow()/MaxCol() + functions provided by CT3 library for CA-Cl*pper. + Application code is encouraged to rather use the + hbct_MaxRow(.T.)/hbct_MaxCol(.T.) functions provided by + Harbour CT library, or hb_ScrMaxRow()/hb_ScrMaxCol() + provided by Harbour RTL, since this extension may + collide in the future with extensions of other overloaded + versions (like the one of FlagShip), and it's currently + (2008 May) the only known non-standard extension slipped into Harbour core. [vszakats] */ #define HB_COMPAT_CT3 diff --git a/harbour/source/rtl/memofile.c b/harbour/source/rtl/memofile.c index a50471c105..9b556c7ddd 100644 --- a/harbour/source/rtl/memofile.c +++ b/harbour/source/rtl/memofile.c @@ -76,7 +76,7 @@ static void hb_memoread( BOOL bHandleEOF ) /* Don't read the file terminating EOF character */ -#if ! defined(HB_OS_UNIX_COMPATIBLE) +#if ! defined( HB_OS_UNIX_COMPATIBLE ) if( bHandleEOF ) { BYTE byEOF = HB_CHAR_NUL; @@ -138,7 +138,7 @@ static BOOL hb_memowrit( BOOL bHandleEOF ) /* NOTE: CA-Cl*pper will add the EOF even if the write failed. [vszakats] */ /* NOTE: CA-Cl*pper will not return .F. when the EOF could not be written. [vszakats] */ -#if ! defined(HB_OS_UNIX_COMPATIBLE) +#if ! defined( HB_OS_UNIX_COMPATIBLE ) if( bHandleEOF ) /* if true, then write EOF */ { BYTE byEOF = HB_CHAR_EOF; diff --git a/harbour/source/rtl/memvarbl.prg b/harbour/source/rtl/memvarbl.prg index de62022c34..b4ba395c58 100644 --- a/harbour/source/rtl/memvarbl.prg +++ b/harbour/source/rtl/memvarbl.prg @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ diff --git a/harbour/source/rtl/mlcfunc.c b/harbour/source/rtl/mlcfunc.c index fab0ff6677..44182d508e 100644 --- a/harbour/source/rtl/mlcfunc.c +++ b/harbour/source/rtl/mlcfunc.c @@ -215,7 +215,7 @@ static PHB_EOL_INFO hb_mlGetEOLs( int iParam, int * piEOLs ) return pEOLs; } -static const char * hb_mlGetParams( int iParAdd, ULONG * pulLen, +static const char * hb_mlGetParams( int iParAdd, ULONG * pulLen, ULONG * pulLineLength, ULONG * pulTabSize, BOOL * pfWordWrap, PHB_EOL_INFO * pEOLs, int * piEOLs ) diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c index 524a9bd8ef..d2f2e0ba92 100644 --- a/harbour/source/rtl/mtran.c +++ b/harbour/source/rtl/mtran.c @@ -104,4 +104,3 @@ HB_FUNC( MEMOTRAN ) else hb_retc_null(); } - diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c index 29a6bbf80b..d08dd0fd13 100644 --- a/harbour/source/rtl/net.c +++ b/harbour/source/rtl/net.c @@ -65,7 +65,7 @@ #include "hbapi.h" -#if defined(HB_OS_OS2) && defined(__GNUC__) +#if defined( HB_OS_OS2 ) && defined( __GNUC__ ) #include "hb_io.h" @@ -75,23 +75,23 @@ #include #include - #if defined(__EMX__) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002 + #if defined( __EMX__ ) && __GNUC__ * 1000 + __GNUC_MINOR__ < 3002 #include #define gethostname __gethostname #endif #define MAXGETHOSTNAME 256 /* should be enough for a host name */ -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) - #if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__) + #if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ ) #include "hb_io.h" #include #endif -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) - #if !defined(__WATCOMC__) + #if !defined( __WATCOMC__ ) #include #include #endif @@ -109,9 +109,9 @@ char * hb_netname( void ) { -#if defined(HB_OS_UNIX) || ( defined(HB_OS_OS2) && defined(__GNUC__) ) +#if defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) -# if defined(__WATCOMC__) +# if defined( __WATCOMC__ ) return hb_getenv( "HOSTNAME" ); # else char * pszValue = ( char * ) hb_xgrab( MAXGETHOSTNAME + 1 ); @@ -120,9 +120,9 @@ char * hb_netname( void ) return pszValue; # endif -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) -# if defined(__DJGPP__) || defined(__RSX32__) || defined(__GNUC__) +# if defined( __DJGPP__ ) || defined( __RSX32__ ) || defined( __GNUC__ ) char * pszValue = ( char * ) hb_xgrab( MAXGETHOSTNAME + 1 ); pszValue[ 0 ] = '\0'; gethostname( pszValue, MAXGETHOSTNAME ); @@ -146,7 +146,7 @@ char * hb_netname( void ) return regs.h.ch == 0 ? hb_strdup( "" ) : pszValue; # endif -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) DWORD ulLen = MAX_COMPUTERNAME_LENGTH + 1; char * pszValue = ( char * ) hb_xgrab( ulLen ); @@ -166,16 +166,16 @@ char * hb_netname( void ) char * hb_username( void ) { -#if defined(HB_OS_UNIX) || ( defined(HB_OS_OS2) && defined(__GNUC__) ) +#if defined( HB_OS_UNIX ) || ( defined( HB_OS_OS2 ) && defined( __GNUC__ ) ) -# if defined(__WATCOMC__) +# if defined( __WATCOMC__ ) return hb_getenv( "USER" ); # else struct passwd * pwd = getpwuid( getuid() ); return pwd ? hb_strdup( pwd->pw_name ) : hb_getenv( "USER" ); # endif -#elif defined(HB_OS_WIN) +#elif defined( HB_OS_WIN ) DWORD ulLen = 256; char * pszValue = ( char * ) hb_xgrab( ulLen ); diff --git a/harbour/source/rtl/oemansi.c b/harbour/source/rtl/oemansi.c index 25c6f10a46..65b6035014 100644 --- a/harbour/source/rtl/oemansi.c +++ b/harbour/source/rtl/oemansi.c @@ -63,7 +63,7 @@ HB_FUNC( HB_ANSITOOEM ) PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { DWORD ulLen = hb_itemGetCLen( pString ); char * pszDst = ( char * ) hb_xgrab( ulLen + 1 ); @@ -84,7 +84,7 @@ HB_FUNC( HB_OEMTOANSI ) PHB_ITEM pString = hb_param( 1, HB_IT_STRING ); if( pString ) -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { DWORD ulLen = hb_itemGetCLen( pString ); char * pszDst = ( char * ) hb_xgrab( ulLen + 1 ); diff --git a/harbour/source/rtl/philes53.c b/harbour/source/rtl/philes53.c index 64d28aef87..b5206a2340 100644 --- a/harbour/source/rtl/philes53.c +++ b/harbour/source/rtl/philes53.c @@ -65,8 +65,8 @@ HB_FUNC( FSETDEVMOD ) hb_fsSetDevMode( hb_numToHandle( hb_parnint( 1 ) ), ( USHORT ) hb_parni( 2 ) ); hb_fsSetFError( hb_fsError() ); } - /* NOTE: INCOMPATIBILITY! C53 will return the device flags - before applying the new setting, Harbour will + /* NOTE: INCOMPATIBILITY! C53 will return the device flags + before applying the new setting, Harbour will always return 0. [vszakats] */ hb_retni( 0 ); } diff --git a/harbour/source/rtl/philesx.c b/harbour/source/rtl/philesx.c index 121642aae3..286b78ec7f 100644 --- a/harbour/source/rtl/philesx.c +++ b/harbour/source/rtl/philesx.c @@ -60,7 +60,7 @@ HB_FUNC( CURDRIVE ) { -#if defined(HB_OS_HAS_DRIVE_LETTER) +#if defined( HB_OS_HAS_DRIVE_LETTER ) char szCurDrive[ 1 ]; const char * szDrive; diff --git a/harbour/source/rtl/profiler.prg b/harbour/source/rtl/profiler.prg index 94712a9141..42d7a2961e 100644 --- a/harbour/source/rtl/profiler.prg +++ b/harbour/source/rtl/profiler.prg @@ -415,7 +415,7 @@ METHOD gather CLASS HBProfile ::gatherFunctions() // Gather method calls - ::gatherMethods() + ::gatherMethods() __setProfiler( lProfile ) @@ -519,7 +519,7 @@ METHOD gather CLASS HBProfileLowLevel // Gather functions and methods. ::super:gather() - // Also gather opcodes. + // Also gather opcodes. ::gatherOPCodes() __setProfiler( lProfile ) diff --git a/harbour/source/rtl/pushbtn.prg b/harbour/source/rtl/pushbtn.prg index 989d0541e0..063514e7ab 100644 --- a/harbour/source/rtl/pushbtn.prg +++ b/harbour/source/rtl/pushbtn.prg @@ -57,11 +57,11 @@ #include "common.ch" #include "setcurs.ch" -/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but +/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ -/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() - functions to generate screen output. Harbour uses Disp*() +/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() + functions to generate screen output. Harbour uses Disp*() functions only. [vszakats] */ #ifdef HB_COMPAT_C53 @@ -293,7 +293,7 @@ METHOD colorSpec( cColorSpec ) CLASS PUSHBUTTON RETURN ::cColorSpec METHOD fBlock( bFBlock ) CLASS PUSHBUTTON - + IF PCount() > 0 ::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) ) ENDIF @@ -320,7 +320,7 @@ METHOD row( nRow ) CLASS PUSHBUTTON RETURN ::nRow METHOD sBlock( bSBlock ) CLASS PUSHBUTTON - + IF PCount() > 0 ::bSBlock := iif( bSBlock == NIL, NIL, __eInstVar53( Self, "SBLOCK", bSBlock, "B", 1001 ) ) ENDIF diff --git a/harbour/source/rtl/radiogrp.prg b/harbour/source/rtl/radiogrp.prg index 2937b1c502..86333c5691 100644 --- a/harbour/source/rtl/radiogrp.prg +++ b/harbour/source/rtl/radiogrp.prg @@ -57,11 +57,11 @@ #include "common.ch" #include "setcurs.ch" -/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but +/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ -/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() - functions to generate screen output. Harbour uses Disp*() +/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() + functions to generate screen output. Harbour uses Disp*() functions only. [vszakats] */ #ifdef HB_COMPAT_C53 @@ -454,7 +454,7 @@ METHOD setColor( cColorSpec ) CLASS RADIOGROUP RETURN Self METHOD setStyle( cStyle ) CLASS RADIOGROUP - + LOCAL nPos LOCAL nLen := ::nItemCount LOCAL aItems := ::aItems @@ -546,7 +546,7 @@ METHOD colorSpec( cColorSpec ) CLASS RADIOGROUP RETURN ::cColorSpec METHOD fBlock( bFBlock ) CLASS RADIOGROUP - + IF PCount() > 0 ::bFBlock := iif( bFBlock == NIL, NIL, __eInstVar53( Self, "FBLOCK", bFBlock, "B", 1001 ) ) ENDIF @@ -591,7 +591,7 @@ METHOD right( nRight ) CLASS RADIOGROUP RETURN ::nRight -METHOD textValue() CLASS RADIOGROUP +METHOD textValue() CLASS RADIOGROUP RETURN ::cTextValue METHOD top( nTop ) CLASS RADIOGROUP diff --git a/harbour/source/rtl/scrollbr.prg b/harbour/source/rtl/scrollbr.prg index cd0139e2aa..6667101ea4 100644 --- a/harbour/source/rtl/scrollbr.prg +++ b/harbour/source/rtl/scrollbr.prg @@ -56,11 +56,11 @@ #include "color.ch" #include "common.ch" -/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but +/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ -/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() - functions to generate screen output. Harbour uses Disp*() +/* NOTE: CA-Cl*pper 5.3 uses a mixture of QQOut(), DevOut(), Disp*() + functions to generate screen output. Harbour uses Disp*() functions only. [vszakats] */ #ifdef HB_COMPAT_C53 @@ -390,7 +390,7 @@ METHOD CalcThumbPos() CLASS SCROLLBAR RETURN .T. -/* New definitions for better coding. These are screen codepage dependent, +/* New definitions for better coding. These are screen codepage dependent, but can be changed with the setStyle method. */ #define SB_UPARROW Chr( 24 ) #define SB_DNARROW Chr( 25 ) diff --git a/harbour/source/rtl/scrrow.c b/harbour/source/rtl/scrrow.c index d4da38c863..d9615a5b32 100644 --- a/harbour/source/rtl/scrrow.c +++ b/harbour/source/rtl/scrrow.c @@ -54,7 +54,7 @@ #include "hbapigt.h" /* - * Normally it gives exactly the same result in all standard GT drivers + * Normally it gives exactly the same result in all standard GT drivers * as MaxRow()/MaxCol(). The difference can appear in some extended * GT drivers which have additional functionality, f.e. CTW GT which * is upper level GT and add CTIII Window support. When it's activated diff --git a/harbour/source/rtl/setposbs.c b/harbour/source/rtl/setposbs.c index 74ed555fba..f00f7b2d8d 100644 --- a/harbour/source/rtl/setposbs.c +++ b/harbour/source/rtl/setposbs.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapigt.h" -/* NOTE: Cannot be disabled with the HB_C52_UNDOC macro, because this symbol +/* NOTE: Cannot be disabled with the HB_C52_UNDOC macro, because this symbol is referenced by the VM [vszakats] */ /* NOTE: Clipper 5.x undocumented */ diff --git a/harbour/source/rtl/stuff.c b/harbour/source/rtl/stuff.c index b95939bdc9..1e5d947c83 100644 --- a/harbour/source/rtl/stuff.c +++ b/harbour/source/rtl/stuff.c @@ -91,4 +91,3 @@ HB_FUNC( STUFF ) else hb_retc_null(); } - diff --git a/harbour/source/rtl/tbrowsys.prg b/harbour/source/rtl/tbrowsys.prg index b17945cc6a..0558628ae7 100644 --- a/harbour/source/rtl/tbrowsys.prg +++ b/harbour/source/rtl/tbrowsys.prg @@ -117,4 +117,3 @@ FUNCTION TBSkip() RETURN NIL #endif - diff --git a/harbour/source/rtl/tgetlist.prg b/harbour/source/rtl/tgetlist.prg index 91ea1fbda0..6e0e097109 100644 --- a/harbour/source/rtl/tgetlist.prg +++ b/harbour/source/rtl/tgetlist.prg @@ -925,7 +925,7 @@ METHOD GUIApplyKey( oGet, oGUI, nKey, oMenu, aMsg ) CLASS HBGetList // Check for SET KEY first IF ( bKeyBlock := SetKey( nKey ) ) != NIL - IF ::GetDoSetKey( bKeyBlock, oGet ) + IF ::GetDoSetKey( bKeyBlock, oGet ) RETURN Self ENDIF ENDIF diff --git a/harbour/source/rtl/tlabel.prg b/harbour/source/rtl/tlabel.prg index 6ca14d7d90..cb5178d8f6 100644 --- a/harbour/source/rtl/tlabel.prg +++ b/harbour/source/rtl/tlabel.prg @@ -138,7 +138,7 @@ METHOD New( cLBLName, lPrinter, cAltFile, lNoConsole, bFor, ; err:subSystem := "FRMLBL" Eval(ErrorBlock(), err) ELSE - /* NOTE: CA-Cl*pper does an RTrim() on the filename here, + /* NOTE: CA-Cl*pper does an RTrim() on the filename here, but in Harbour we're using _SET_TRIMFILENAME. [vszakats] */ IF Set( _SET_DEFEXTENSIONS ) hb_FNameSplit( cLBLName, NIL, NIL, @cExt ) diff --git a/harbour/source/rtl/tmenuitm.prg b/harbour/source/rtl/tmenuitm.prg index 1e5cbdb2b3..3095a614a1 100644 --- a/harbour/source/rtl/tmenuitm.prg +++ b/harbour/source/rtl/tmenuitm.prg @@ -55,7 +55,7 @@ #include "button.ch" #include "common.ch" -/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but +/* NOTE: Harbour doesn't support CA-Cl*pper 5.3 GUI functionality, but it has all related variables and methods. */ #ifdef HB_COMPAT_C53 diff --git a/harbour/source/rtl/tobject.prg b/harbour/source/rtl/tobject.prg index 0a5968ef12..e591b73b1d 100644 --- a/harbour/source/rtl/tobject.prg +++ b/harbour/source/rtl/tobject.prg @@ -68,7 +68,7 @@ * */ -/* WARNING: Can not use the preprocessor, otherwise +/* WARNING: Can not use the preprocessor, otherwise it will auto inherit from itself. */ #include "common.ch" diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index d5faf44e9a..5202819ed2 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -143,7 +143,7 @@ HB_FUNC( TRANSFORM ) case ')': uiPicFlags |= PF_PARNEGWOS; break; -#if defined(HB_COMPAT_XPP) || defined(HB_COMPAT_FOXPRO) +#if defined( HB_COMPAT_XPP ) || defined( HB_COMPAT_FOXPRO ) case 'L': case '0': uiPicFlags |= PF_PADL; /* FoxPro/XPP extension */ @@ -281,7 +281,7 @@ HB_FUNC( TRANSFORM ) else { /* NOTE: This is a FoxPro compatible [jarabal] */ -#if defined(HB_COMPAT_FOXPRO) +#if defined( HB_COMPAT_FOXPRO ) ulPicLen = 0; break; #else diff --git a/harbour/source/rtl/typefile.prg b/harbour/source/rtl/typefile.prg index e527c2091b..b5f8560cdb 100644 --- a/harbour/source/rtl/typefile.prg +++ b/harbour/source/rtl/typefile.prg @@ -138,7 +138,7 @@ PROCEDURE __TypeFile( cFile, lPrint ) FSeek( nHandle, 0 ) // go top /* Here we try to read a line at a time but I think we could just - display the whole buffer since it said: + display the whole buffer since it said: "without any headings or formating" */ nHasRead := 0 diff --git a/harbour/source/rtl/wait.prg b/harbour/source/rtl/wait.prg index 5a6e5d0c89..c5976bb9f9 100644 --- a/harbour/source/rtl/wait.prg +++ b/harbour/source/rtl/wait.prg @@ -74,7 +74,7 @@ FUNCTION __Wait( xPrompt ) EXIT ENDIF - + ENDDO RETURN Chr( nKey ) diff --git a/harbour/source/rtl/xsavescr.c b/harbour/source/rtl/xsavescr.c index f25c385879..315f2d0ef8 100644 --- a/harbour/source/rtl/xsavescr.c +++ b/harbour/source/rtl/xsavescr.c @@ -98,7 +98,7 @@ HB_FUNC( __XSAVESCREEN ) } /* NOTE: There's no check about the screen size on restore, so this will - fail if the user has changed the screen resolution between calling + fail if the user has changed the screen resolution between calling save and restore. [vszakats] */ diff --git a/harbour/source/vm/break.c b/harbour/source/vm/break.c index 40b58511c6..93088448ff 100644 --- a/harbour/source/vm/break.c +++ b/harbour/source/vm/break.c @@ -63,4 +63,3 @@ HB_FUNC( BREAK ) { hb_vmRequestBreak( hb_param( 1, HB_IT_ANY ) ); } - diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c index 7cc4f2b6a9..cdedbd9fb0 100644 --- a/harbour/source/vm/classes.c +++ b/harbour/source/vm/classes.c @@ -5119,7 +5119,7 @@ HB_FUNC( __CLS_PAR00 ) * It will be removed in the future so please do not use it. * Use hb_objHasMessage() instead. */ -#if defined(__cplusplus) +#if defined( __cplusplus ) extern "C" BOOL hb_objGetpMethod( PHB_ITEM pObject, PHB_SYMB pMessage ); #endif BOOL hb_objGetpMethod( PHB_ITEM pObject, PHB_SYMB pMessage ) diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c index ee1ccc09e4..bb60131b57 100644 --- a/harbour/source/vm/cmdarg.c +++ b/harbour/source/vm/cmdarg.c @@ -484,7 +484,7 @@ ULONG hb_cmdargProcessVM( int *pCancelKey, int *pCancelKeyEx ) { char buffer[ 128 ]; -#if defined(HB_C52_STRICT) +#if defined( HB_C52_STRICT ) hb_snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ) ); #else hb_snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB MemStat:%s MT:%s", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ), hb_xquery( HB_MEM_USEDMAX ) ? "On" : "Off", hb_vmIsMt() ? "On" : "Off" ); diff --git a/harbour/source/vm/dynlibhb.c b/harbour/source/vm/dynlibhb.c index 8310563bd5..32fd7f269c 100644 --- a/harbour/source/vm/dynlibhb.c +++ b/harbour/source/vm/dynlibhb.c @@ -64,7 +64,7 @@ #include "hbstack.h" #include "hbvm.h" -#if defined(HB_OS_LINUX) && !defined(__WATCOMC__) +#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) # include #endif @@ -144,7 +144,7 @@ HB_FUNC( HB_LIBFREE ) fResult = FreeLibrary( ( HMODULE ) hDynLib ); #elif defined( HB_OS_OS2 ) fResult = DosFreeModule( ( HMODULE ) hDynLib ) == NO_ERROR; -#elif defined( HB_OS_LINUX ) && !defined (__WATCOMC__ ) +#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) fResult = dlclose( hDynLib ) == 0; #endif } @@ -155,7 +155,7 @@ HB_FUNC( HB_LIBFREE ) HB_FUNC( HB_LIBERROR ) { -#if defined(HB_OS_LINUX) && !defined(__WATCOMC__) +#if defined( HB_OS_LINUX ) && !defined( __WATCOMC__ ) hb_retc( dlerror() ); #else hb_retc_null(); diff --git a/harbour/source/vm/extrap.c b/harbour/source/vm/extrap.c index a527db336c..bc3018e84a 100644 --- a/harbour/source/vm/extrap.c +++ b/harbour/source/vm/extrap.c @@ -84,7 +84,7 @@ # endif #endif -#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) # include /* BCC and MinGW doesn't seem to #define this */ # ifndef TH32CS_SNAPMODULE32 @@ -96,7 +96,7 @@ static BYTE * s_signal_stack[ SIGSTKSZ ]; #endif -#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExceptionInfo ) { @@ -105,7 +105,7 @@ LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExceptionInfo errmsg[ 0 ] = '\0'; -#if defined(HB_OS_WIN_64) && (defined(_M_X64) || defined(__MINGW64__)) +#if defined( HB_OS_WIN_64 ) && ( defined( _M_X64 ) || defined( __MINGW64__ ) ) { PCONTEXT pCtx = pExceptionInfo->ContextRecord; @@ -134,7 +134,7 @@ LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExceptionInfo See: - StackWalk64() - http://www.codeproject.com/KB/threads/StackWalker.aspx?fid=202364 */ } -#elif defined(HB_OS_WIN_64) && defined(_M_IA64) +#elif defined( HB_OS_WIN_64 ) && defined( _M_IA64 ) { /* TODO: Itanium See: winnt.h for PCONTEXT structure. */ @@ -280,7 +280,7 @@ LONG WINAPI hb_winExceptionHandler( struct _EXCEPTION_POINTERS * pExceptionInfo return hb_cmdargCheck( "BATCH" ) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) static EXCEPTIONREGISTRATIONRECORD s_regRec; /* Exception Registration Record */ @@ -358,12 +358,12 @@ static void hb_signalExceptionHandler( int sig, siginfo_t * si, void * ucp ) void hb_vmSetExceptionHandler( void ) { -#if defined(HB_OS_WIN) && !defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE ) { LPTOP_LEVEL_EXCEPTION_FILTER ef = SetUnhandledExceptionFilter( hb_winExceptionHandler ); HB_SYMBOL_UNUSED( ef ); } -#elif defined(HB_OS_OS2) /* Add OS2TermHandler to this thread's chain of exception handlers */ +#elif defined( HB_OS_OS2 ) /* Add OS2TermHandler to this thread's chain of exception handlers */ { APIRET rc; /* Return code */ @@ -401,7 +401,7 @@ void hb_vmSetExceptionHandler( void ) void hb_vmUnsetExceptionHandler( void ) { -#if defined(HB_OS_OS2) /* Add OS2TermHandler to this thread's chain of exception handlers */ +#if defined( HB_OS_OS2 ) /* Add OS2TermHandler to this thread's chain of exception handlers */ { APIRET rc; /* Return code */ diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index 3697392a98..f9a304e533 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -1091,13 +1091,13 @@ ULONG hb_xquery( USHORT uiMode ) switch( uiMode ) { case HB_MEM_CHAR: /* (Free Variable Space [KB]) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = memorystatus.dwAvailPhys / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { ULONG ulSysInfo = 0; @@ -1112,13 +1112,13 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_BLOCK: /* (Largest String [KB]) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = HB_MIN( memorystatus.dwAvailPhys, ULONG_MAX ) / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { ULONG ulSysInfo = 0; @@ -1133,13 +1133,13 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_RUN: /* (RUN Memory [KB]) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = memorystatus.dwAvailPhys / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { ULONG ulSysInfo = 0; @@ -1154,13 +1154,13 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_VM: /* UNDOCUMENTED! (Virtual Memory [KB]) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = memorystatus.dwAvailVirtual / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { ULONG ulSysInfo = 0; @@ -1175,7 +1175,7 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_EMS: /* UNDOCUMENTED! (Free Expanded Memory [KB]) (?) */ -#if defined(HB_OS_WIN) || defined(HB_OS_OS2) +#if defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) ulResult = 0; #else ulResult = 9999; @@ -1183,13 +1183,13 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_FM: /* UNDOCUMENTED! (Fixed Memory/Heap [KB]) (?) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = memorystatus.dwTotalPhys / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { ULONG ulSysInfo = 0; @@ -1204,7 +1204,7 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_FMSEGS: /* UNDOCUMENTED! (Segments in Fixed Memory/Heap) (?) */ -#if defined(HB_OS_WIN) || defined(HB_OS_OS2) +#if defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) ulResult = 1; #else ulResult = 9999; @@ -1212,13 +1212,13 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_SWAP: /* UNDOCUMENTED! (Free Swap Memory [KB]) */ -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) { MEMORYSTATUS memorystatus; GlobalMemoryStatus( &memorystatus ); ulResult = memorystatus.dwAvailPageFile / 1024; } -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) { /* NOTE: There is no way to know how much a swap file can grow on an OS/2 system. I think we should return free space on DASD @@ -1231,7 +1231,7 @@ ULONG hb_xquery( USHORT uiMode ) break; case HB_MEM_CONV: /* UNDOCUMENTED! (Free Conventional [KB]) */ -#if defined(HB_OS_WIN) || defined(HB_OS_OS2) +#if defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) ulResult = 0; #else ulResult = 9999; diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 3cb44ae9dc..43870cf201 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -11504,12 +11504,12 @@ HB_LANG_REQUEST( HB_LANG_DEFAULT ) #undef HB_FORCE_LINK_MAIN -#if !defined(HB_DYNLIB) && defined(HB_OS_WIN) && \ - ( defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW32__) ) +#if !defined( HB_DYNLIB ) && defined( HB_OS_WIN ) && \ + ( defined( __DMC__ ) || defined( __WATCOMC__ ) || defined( __MINGW32__ ) ) # define HB_FORCE_LINK_MAIN hb_forceLinkMainWin -#elif defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) || defined(HB_OS_WIN) ) +#elif defined( __WATCOMC__ ) && ( defined( HB_OS_LINUX ) || defined( HB_OS_OS2 ) || defined( HB_OS_WIN ) ) # define HB_FORCE_LINK_MAIN hb_forceLinkMainStd diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 2fbba17818..7839b12a8e 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -98,10 +98,10 @@ #include "hbmath.h" #include "hbapicdp.h" -#if defined(HB_OS_SUNOS) +#if defined( HB_OS_SUNOS ) # include -#elif defined(_MSC_VER) || defined(__BORLANDC__) || \ - defined(__WATCOMC__) || defined(__IBMCPP__) +#elif defined( _MSC_VER ) || defined( __BORLANDC__ ) || \ + defined( __WATCOMC__ ) || defined( __IBMCPP__ ) # include /* for _finite() and _isnan() */ #endif @@ -2259,13 +2259,13 @@ BOOL hb_itemStrBuf( char *szResult, PHB_ITEM pNumber, int iSize, int iDec ) /* TODO: look if finite()/_finite() or isinf()/_isinf and isnan()/_isnan does exist for your compiler and add this to the check below */ -#if defined(__RSXNT__) || defined(__EMX__) || \ - defined(__XCC__) || defined(__POCC__) || \ - defined(__MINGW32__) || defined(HB_OS_HPUX) +#if defined( __RSXNT__ ) || defined( __EMX__ ) || \ + defined( __XCC__ ) || defined( __POCC__ ) || \ + defined( __MINGW32__ ) || defined( HB_OS_HPUX ) # define HB_FINITE_DBL(d) ( isfinite(d)!=0 ) -#elif defined(__WATCOMC__) || defined(__BORLANDC__) || defined(_MSC_VER) +#elif defined( __WATCOMC__ ) || defined( __BORLANDC__ ) || defined( _MSC_VER ) # define HB_FINITE_DBL(d) ( _finite(d)!=0 ) -#elif defined(__GNUC__) || defined(__DJGPP__) || defined(__LCC__) +#elif defined( __GNUC__ ) || defined( __DJGPP__ ) || defined( __LCC__ ) # define HB_FINITE_DBL(d) ( finite(d)!=0 ) #else int iTODO; diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c index 91bf7969ad..183c417465 100644 --- a/harbour/source/vm/macro.c +++ b/harbour/source/vm/macro.c @@ -1381,7 +1381,7 @@ void hb_macroGenPopAliasedVar( const char * szVarName, /* TODO: memvars created inside TYPE() function should have PUBLIC scope */ hb_macroMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_COMP_PARAM ); } - else if( iLen >= 4 && iLen <= 6 && + else if( iLen >= 4 && iLen <= 6 && ( strncmp( szAlias, "FIELD", iLen ) == 0 || strncmp( szAlias, "_FIELD", iLen ) == 0 ) ) { /* FIELD-> */ @@ -1476,7 +1476,7 @@ void hb_macroGenPushAliasedVar( const char * szVarName, { /* M-> or MEMV-> or MEMVA-> or MEMVAR-> variable */ hb_macroMemvarGenPCode( HB_P_MPUSHMEMVAR, szVarName, HB_COMP_PARAM ); } - else if( iLen >= 4 && iLen <= 6 && + else if( iLen >= 4 && iLen <= 6 && ( strncmp( szAlias, "FIELD", iLen ) == 0 || strncmp( szAlias, "_FIELD", iLen ) == 0 ) ) { /* FIELD-> */ @@ -1566,7 +1566,7 @@ void hb_macroGenPushString( const char * szText, ULONG ulStrLen, HB_COMP_DECL ) { if( ulStrLen <= USHRT_MAX ) hb_macroGenPCode3( HB_P_MPUSHSTR, HB_LOBYTE( ulStrLen ), HB_HIBYTE( ulStrLen ), HB_COMP_PARAM ); - else + else hb_macroGenPCode4( HB_P_MPUSHSTRLARGE, HB_LOBYTE( ulStrLen ), HB_HIBYTE( ulStrLen ), HB_ULBYTE( ulStrLen ), HB_COMP_PARAM ); hb_macroGenPCodeN( ( BYTE * ) szText, ulStrLen, HB_COMP_PARAM ); } diff --git a/harbour/source/vm/main.c b/harbour/source/vm/main.c index 69f494673c..2588227489 100644 --- a/harbour/source/vm/main.c +++ b/harbour/source/vm/main.c @@ -55,11 +55,10 @@ #include "hbsetup.h" -#if defined(HB_MAIN_STD) +#if defined( HB_MAIN_STD ) #include "mainstd.c" -#elif defined(HB_MAIN_WIN) +#elif defined( HB_MAIN_WIN ) #include "mainwin.c" #else #include "mainstd.c" /* Use the standard ANSI C entry point if not speficied */ #endif - diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c index ad63449fb3..7476a1eed0 100644 --- a/harbour/source/vm/maindll.c +++ b/harbour/source/vm/maindll.c @@ -60,7 +60,7 @@ #include "hbvm.h" #include "hbapiitm.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) HB_EXPORT BOOL WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved ); diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c index 0235edd78b..3723e356b3 100644 --- a/harbour/source/vm/maindllp.c +++ b/harbour/source/vm/maindllp.c @@ -67,7 +67,7 @@ #elif defined( __BORLANDC__ ) #define HB_DLL_NAME2 TEXT( "harbour-20-bcc.dll" ) #define HB_DLL_NAMEMT2 TEXT( "harbourmt-20-bcc.dll" ) -#elif (defined( _MSC_VER ) && defined( _M_X64 )) || defined(__MINGW64__) +#elif ( defined( _MSC_VER ) && defined( _M_X64 ) ) || defined( __MINGW64__ ) #define HB_DLL_NAME2 TEXT( "harbour-20-x64.dll" ) #define HB_DLL_NAMEMT2 TEXT( "harbourmt-20-x64.dll" ) #elif defined( _MSC_VER ) && defined( _M_IA64 ) @@ -84,10 +84,10 @@ #define HBTEXT( x ) x #endif -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) HB_EXTERN_BEGIN -#if defined(HB_OS_WIN_CE) +#if defined( HB_OS_WIN_CE ) static FARPROC hb_getProcAddress( LPCTSTR szProcName ) #else static FARPROC hb_getProcAddress( LPCSTR szProcName ) diff --git a/harbour/source/vm/mainstd.c b/harbour/source/vm/mainstd.c index 2e57c04e97..5fa7ae2409 100644 --- a/harbour/source/vm/mainstd.c +++ b/harbour/source/vm/mainstd.c @@ -54,9 +54,9 @@ #include "hbvm.h" HB_EXTERN_BEGIN -#if defined(__MINGW32__) +#if defined( __MINGW32__ ) int _CRT_glob = 0; -#elif defined(__DJGPP__) +#elif defined( __DJGPP__ ) #include @@ -75,7 +75,7 @@ int main( int argc, char * argv[] ) { HB_TRACE(HB_TR_DEBUG, ("main(%d, %p)", argc, argv)); -#if defined(__DJGPP__) +#if defined( __DJGPP__ ) __system_flags = __system_redirect | __system_allow_long_cmds | @@ -89,7 +89,7 @@ int main( int argc, char * argv[] ) return hb_vmQuit(); } -#if defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) || defined(HB_OS_WIN) ) +#if defined( __WATCOMC__ ) && ( defined( HB_OS_LINUX ) || defined( HB_OS_OS2 ) || defined( HB_OS_WIN ) ) void hb_forceLinkMainStd( void ) {} #endif diff --git a/harbour/source/vm/mainwin.c b/harbour/source/vm/mainwin.c index 8d2daa4386..d7174a9811 100644 --- a/harbour/source/vm/mainwin.c +++ b/harbour/source/vm/mainwin.c @@ -55,12 +55,12 @@ #include "hbapi.h" #include "hbvm.h" -#if defined(HB_OS_WIN) +#if defined( HB_OS_WIN ) #define HB_VM_STARTUP #include "hbwmain.c" -#if !defined(HB_DYNLIB) && ( defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW32__) ) +#if !defined( HB_DYNLIB ) && ( defined( __DMC__ ) || defined( __WATCOMC__ ) || defined( __MINGW32__ ) ) HB_EXTERN_BEGIN void hb_forceLinkMainWin( void ) {} HB_EXTERN_END diff --git a/harbour/source/vm/set.c b/harbour/source/vm/set.c index 658a312e1a..49687a2584 100644 --- a/harbour/source/vm/set.c +++ b/harbour/source/vm/set.c @@ -201,7 +201,7 @@ static BOOL is_devicename( const char * szFileName ) { if( szFileName && *szFileName ) { -#if defined(HB_OS_OS2) || defined(HB_OS_WIN) || defined(HB_OS_DOS) +#if defined( HB_OS_OS2 ) || defined( HB_OS_WIN ) || defined( HB_OS_DOS ) int iLen = ( int ) strlen( szFileName ); if( ( iLen == 3 && ( hb_stricmp( szFileName, "PRN" ) == 0 || @@ -214,7 +214,7 @@ static BOOL is_devicename( const char * szFileName ) { return TRUE; } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) if( strncmp( szFileName, "/dev/", 5 ) == 0 ) return TRUE; else @@ -272,7 +272,7 @@ static void open_handle( PHB_SET_STRUCT pSet, const char * file_name, if( file_name && file_name[ 0 ] != '\0' ) { /* Create full filename */ -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) bPipe = file_name[ 0 ] == '|'; if( bPipe ) { @@ -287,7 +287,7 @@ static void open_handle( PHB_SET_STRUCT pSet, const char * file_name, if( is_devicename( file_name ) ) { -#if defined(HB_OS_OS2) || defined(HB_OS_WIN) || defined(HB_OS_DOS) +#if defined( HB_OS_OS2 ) || defined( HB_OS_WIN ) || defined( HB_OS_DOS ) hb_strupr( ( char * ) pFilename->szName ); #endif } @@ -529,11 +529,11 @@ HB_FUNC( SETCANCEL ) /* return default printer device */ static char * hb_set_PRINTFILE_default( void ) { -#if defined(HB_OS_UNIX) +#if defined( HB_OS_UNIX ) return hb_strdup( "|lpr" ); -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) return hb_strdup( "PRN" ); -#elif defined(HB_OS_WIN) || defined(HB_OS_OS2) +#elif defined( HB_OS_WIN ) || defined( HB_OS_OS2 ) return hb_strdup( "LPT1" ); #else return hb_strdup( "PRN" ); /* TOFIX */ @@ -1082,7 +1082,7 @@ void hb_setInitialize( PHB_SET_STRUCT pSet ) pSet->HB_SET_DELIMCHARS = hb_strdup( "::" ); pSet->HB_SET_DELIMITERS = FALSE; pSet->HB_SET_DEVICE = hb_strdup( "SCREEN" ); -#if defined(HB_OS_UNIX_COMPATIBLE) +#if defined( HB_OS_UNIX_COMPATIBLE ) pSet->HB_SET_EOF = FALSE; #else pSet->HB_SET_EOF = TRUE; diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c index e95c966a60..0afac0d121 100644 --- a/harbour/source/vm/thread.c +++ b/harbour/source/vm/thread.c @@ -242,12 +242,12 @@ void hb_threadReleaseCPU( void ) hb_taskSleep( 20 ); -#elif defined(HB_OS_WIN) || defined(__CYGWIN__) +#elif defined( HB_OS_WIN ) || defined( __CYGWIN__ ) /* Forfeit the remainder of the current time slice. */ Sleep( 20 ); -#elif defined(HB_OS_OS2) +#elif defined( HB_OS_OS2 ) /* 23/nov/2000 - maurilio.longo@libero.it Minimum time slice under OS/2 is 32 milliseconds, passed 1 will be rounded to 32 and @@ -257,7 +257,7 @@ void hb_threadReleaseCPU( void ) bug which causes DosSleep(0) not to work as expected. */ DosSleep( 1 ); /* Duration is in milliseconds */ -#elif defined(HB_OS_DOS) +#elif defined( HB_OS_DOS ) /* NOTE: there is a bug under NT 4 and 2000 - if the app is running in protected mode, time slices will _not_ be released - you must switch @@ -277,7 +277,7 @@ void hb_threadReleaseCPU( void ) HB_DOS_INT86( 0x2F, ®s, ®s ); } -#elif defined(HB_OS_UNIX) +#elif defined( HB_OS_UNIX ) { struct timeval tv; tv.tv_sec = 0; diff --git a/harbour/utils/hbtest/rt_main.ch b/harbour/utils/hbtest/rt_main.ch index 856b9c4673..991fcb047b 100644 --- a/harbour/utils/hbtest/rt_main.ch +++ b/harbour/utils/hbtest/rt_main.ch @@ -71,4 +71,3 @@ #ifndef __HARBOUR__ #define HB_C52_STRICT #endif - diff --git a/harbour/utils/hbtest/rt_main.h b/harbour/utils/hbtest/rt_main.h index 6df345d8d7..ee463c19fe 100644 --- a/harbour/utils/hbtest/rt_main.h +++ b/harbour/utils/hbtest/rt_main.h @@ -57,13 +57,13 @@ /* NOTE: Do not use names longer than 10 chars for .prg callable functions. This is to keep things simple. [vszakats] */ -#if defined(__HARBOUR__) +#if defined( __HARBOUR__ ) #include "hbundoc.api" #define RT_FUNDEF( funcname ) HB_FUNC( funcname ) -#elif defined(__XPP__) +#elif defined( __XPP__ ) #define RT_FUNDEF( funcname ) XPPRET XPPENTRY funcname ( XppParamList paramList ) diff --git a/harbour/utils/hbtest/rt_misc.prg b/harbour/utils/hbtest/rt_misc.prg index b5addc0dc6..54108a7a78 100644 --- a/harbour/utils/hbtest/rt_misc.prg +++ b/harbour/utils/hbtest/rt_misc.prg @@ -411,7 +411,7 @@ PROCEDURE Main_MISC() #ifdef __HARBOUR__ #ifndef HB_C52_UNDOC - /* NOTE: Use the identical internal versions if Harbour + /* NOTE: Use the identical internal versions if Harbour was compiled without C5.x undocumented features. [vszakats] */ #xtranslate NationMsg([]) => __NatMsg() diff --git a/harbour/utils/hbtest/rt_trans.prg b/harbour/utils/hbtest/rt_trans.prg index d1c34ab4c9..854df6b4d8 100644 --- a/harbour/utils/hbtest/rt_trans.prg +++ b/harbour/utils/hbtest/rt_trans.prg @@ -423,7 +423,7 @@ PROCEDURE Main_TRANS() * ? transform( "AB", "@E" ) * ? transform( "ab", "@E" ) * [druzus] - */ + */ TEST_LINE( Transform(".", "@E" ) , " " ) TEST_LINE( Transform(",", "@E" ) , "." ) TEST_LINE( Transform("..", "@E" ) , ","+Chr(0)+"" ) @@ -590,8 +590,8 @@ PROCEDURE Main_TRANS() TEST_LINE( Transform( -12345, "@( $999999" ) , "( 12345)" ) TEST_LINE( Transform( -12345, "@) $999999" ) , "$(12345)" ) TEST_LINE( Transform( -12345, "@( #999999" ) , "( 12345)" ) - TEST_LINE( Transform( -12345, "@) #999999" ) , " (12345)" ) - TEST_LINE( Transform( -12345, "@( $99999" ) , "(12345)" ) + TEST_LINE( Transform( -12345, "@) #999999" ) , " (12345)" ) + TEST_LINE( Transform( -12345, "@( $99999" ) , "(12345)" ) TEST_LINE( Transform( -12345, "@) $99999" ) , "(12345)" ) TEST_LINE( Transform( -12345, "@( #99999" ) , "(12345)" ) TEST_LINE( Transform( -12345, "@) #99999" ) , "(12345)" ) diff --git a/harbour/utils/hbtest/rt_vars.ch b/harbour/utils/hbtest/rt_vars.ch index e1cac23968..205bc4c0ae 100644 --- a/harbour/utils/hbtest/rt_vars.ch +++ b/harbour/utils/hbtest/rt_vars.ch @@ -100,4 +100,3 @@ STATIC sbBlock STATIC sbBlockC STATIC saArray STATIC saAllTypes -