fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-02-03 22:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/harbour.hbx
  * src/rtl/hbfilehi.prg
    * Renames in new path/fn handling functions.
      * HB_FNAMEDIRGET()     -> HB_FNAMEDIR()
      * HB_FNAMENAMEGET()    -> HB_FNAMENAME()
      * HB_FNAMENAMEEXTGET() -> HB_FNAMENAMEEXT()
      * HB_FNAMEEXTGET()     -> HB_FNAMEEXT()
      * HB_FNAMEEXTDEF()     -> HB_FNAMEEXTSETDEF()

  ; Patch from Tamas:

  * src/rtl/hbcom.c
    + adds minix serial device names to hbcom

  * utils/hbmk2/hbmk2.prg
    ! Fixed RTE regression in previous recent minix patch.

  * config/dos/djgpp.mk
    ! Applied previous C++ gcc flag patch also to djgpp.
This commit is contained in:
Viktor Szakats
2011-02-03 21:44:01 +00:00
parent e974cbc2fc
commit 4d140dc2d6
6 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/ChangeLog
View File

@@ -16,6 +16,27 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-03 22:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/harbour.hbx
* src/rtl/hbfilehi.prg
* Renames in new path/fn handling functions.
* HB_FNAMEDIRGET() -> HB_FNAMEDIR()
* HB_FNAMENAMEGET() -> HB_FNAMENAME()
* HB_FNAMENAMEEXTGET() -> HB_FNAMENAMEEXT()
* HB_FNAMEEXTGET() -> HB_FNAMEEXT()
* HB_FNAMEEXTDEF() -> HB_FNAMEEXTSETDEF()
; Patch from Tamas:
* src/rtl/hbcom.c
+ adds minix serial device names to hbcom
* utils/hbmk2/hbmk2.prg
! Fixed RTE regression in previous recent minix patch.
* config/dos/djgpp.mk
! Applied previous C++ gcc flag patch also to djgpp.
2011-02-03 18:16 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/hbsocket.c
* contrib/xhb/xhb.hbp

5
harbour/config/dos/djgpp.mk
View File

@@ -22,7 +22,10 @@ CFLAGS += -I. -I$(HB_HOST_INC)
ifneq ($(HB_BUILD_WARN),no)
CFLAGS += -W -Wall
else
CFLAGS += -Wimplicit-int -Wimplicit-function-declaration -Wmissing-braces -Wreturn-type -Wformat
CFLAGS += -Wmissing-braces -Wreturn-type -Wformat
ifneq ($(HB_BUILD_MODE),cpp)
CFLAGS += -Wimplicit-int -Wimplicit-function-declaration
endif
endif
ifneq ($(HB_BUILD_OPTIM),no)

10
harbour/include/harbour.hbx
View File

@@ -420,14 +420,14 @@ DYNAMIC HB_FLINK
DYNAMIC HB_FLINKREAD
DYNAMIC HB_FLINKSYM
DYNAMIC HB_FLOCK
DYNAMIC HB_FNAMEDIRGET
DYNAMIC HB_FNAMEDIR
DYNAMIC HB_FNAMEEXISTS
DYNAMIC HB_FNAMEEXTDEF
DYNAMIC HB_FNAMEEXTGET
DYNAMIC HB_FNAMEEXT
DYNAMIC HB_FNAMEEXTSET
DYNAMIC HB_FNAMEEXTSETDEF
DYNAMIC HB_FNAMEMERGE
DYNAMIC HB_FNAMENAMEEXTGET
DYNAMIC HB_FNAMENAMEGET
DYNAMIC HB_FNAMENAME
DYNAMIC HB_FNAMENAMEEXT
DYNAMIC HB_FNAMESPLIT
DYNAMIC HB_FORNEXT
DYNAMIC HB_FSETATTR

2
harbour/src/rtl/hbcom.c
View File

@@ -192,6 +192,8 @@ static const char * hb_comGetName( PHB_COM pCom, char * buffer, int size )
hb_snprintf( buffer, size, "/dev/ttyf%02d", pCom->port );
# elif defined( HB_OS_DARWIN )
hb_snprintf( buffer, size, "/dev/cuaa%d", pCom->port - 1 );
# elif defined( HB_OS_MINIX )
hb_snprintf( buffer, size, "/dev/tty%02d", pCom->port - 1 );
# else /* defined( HB_OS_LINUX ) || defined( HB_OS_CYGWIN ) || ... */
hb_snprintf( buffer, size, "/dev/ttyS%d", pCom->port - 1 );
# endif

30
harbour/src/rtl/hbfilehi.prg
View File

@@ -339,39 +339,28 @@ FUNCTION hb_DirUnbuild( cDir )
RETURN .T.
FUNCTION hb_FNameDirGet( cFileName )
FUNCTION hb_FNameDir( cFileName )
LOCAL cDir
hb_FNameSplit( cFileName, @cDir )
RETURN cDir
FUNCTION hb_FNameNameGet( cFileName )
FUNCTION hb_FNameName( cFileName )
LOCAL cName
hb_FNameSplit( cFileName,, @cName )
RETURN cName
FUNCTION hb_FNameNameExtGet( cFileName )
FUNCTION hb_FNameNameExt( cFileName )
LOCAL cName, cExt
hb_FNameSplit( cFileName,, @cName, @cExt )
RETURN hb_FNameMerge( NIL, cName, cExt )
FUNCTION hb_FNameExtDef( cFileName, cDefExt )
LOCAL cDir, cName, cExt
hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
IF Empty( cExt )
cExt := cDefExt
ENDIF
RETURN hb_FNameMerge( cDir, cName, cExt )
FUNCTION hb_FNameExtGet( cFileName )
FUNCTION hb_FNameExt( cFileName )
LOCAL cExt
hb_FNameSplit( cFileName,,, @cExt )
@@ -384,3 +373,14 @@ FUNCTION hb_FNameExtSet( cFileName, cExt )
hb_FNameSplit( cFileName, @cDir, @cName )
RETURN hb_FNameMerge( cDir, cName, cExt )
FUNCTION hb_FNameExtSetDef( cFileName, cDefExt )
LOCAL cDir, cName, cExt
hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
IF Empty( cExt )
cExt := cDefExt
ENDIF
RETURN hb_FNameMerge( cDir, cName, cExt )

8
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -3211,7 +3211,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT
CASE _WARN_LOW
AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" )
IF ! hbmk[ _HBMK_lCPP ]
IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ]
AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" )
ENDIF
EXIT
@@ -3474,7 +3474,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT
CASE _WARN_LOW
AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" )
IF ! hbmk[ _HBMK_lCPP ]
IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ]
AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" )
ENDIF
EXIT
@@ -3615,7 +3615,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT
CASE _WARN_LOW
AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" )
IF ! hbmk[ _HBMK_lCPP ]
IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ]
AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" )
ENDIF
EXIT
@@ -3728,7 +3728,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-W -Wall" ) ; EXIT
CASE _WARN_LOW
AAdd( hbmk[ _HBMK_aOPTC ], "-Wmissing-braces -Wreturn-type -Wformat" )
IF ! hbmk[ _HBMK_lCPP ]
IF hbmk[ _HBMK_lCPP ] != NIL .AND. ! hbmk[ _HBMK_lCPP ]
AAdd( hbmk[ _HBMK_aOPTC ], "-Wimplicit-int -Wimplicit-function-declaration" )
ENDIF
EXIT