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

2009-03-07 12:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* utils/hbmk2/hbmk2.prg
    ! Fixed recently introd problem with path sep translation.

  * source/common/hbgete.c
    + Enabled Darwin support.

  * contrib/examples/uhttpd/modules/showcounter.prg
    ! Protected whole code with GD_SUPPORT.
This commit is contained in:
Viktor Szakats
2009-03-07 11:51:14 +00:00
parent 2b1840acb3
commit dc7cdeb762
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -8,6 +8,16 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-07 12:38 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Fixed recently introd problem with path sep translation.
* source/common/hbgete.c
+ Enabled Darwin support.
* contrib/examples/uhttpd/modules/showcounter.prg
! Protected whole code with GD_SUPPORT.
2009-03-07 11:43 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com)
* harbour/contrib/examples/uhttpd/uhttpd.prg
* Updated uHTTPD (Work in progress)

11
harbour/contrib/examples/uhttpd/modules/showcounter.prg
View File

@@ -50,6 +50,7 @@
*
*/
#if defined( GD_SUPPORT )
MEMVAR _SERVER // defined in uHTTPD
MEMVAR _REQUEST // defined in uHTTPD
@@ -58,12 +59,12 @@ MEMVAR _REQUEST // defined in uHTTPD
//#include "xhb.ch"
#include "gd.ch"
#ifdef __PLATFORM__WINDOWS
#define IMAGES_IN "..\..\hbgd\tests\digits\"
#define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + "\counter\" )
#else
#ifdef __PLATFORM__UNIX
#define IMAGES_IN "../../hbgd/tests/digits/"
#define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + "/counter/" )
#else
#define IMAGES_IN "..\..\hbgd\tests\digits\"
#define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + "\counter\" )
#endif
#define DISPLAY_NUM 10
@@ -220,3 +221,5 @@ STATIC FUNCTION CreateCounter( cValue, cBaseImage )
//RETURN cFile
RETURN oI:ToStringGif()
#endif

3
harbour/source/common/hbgete.c
View File

@@ -157,7 +157,8 @@ BOOL hb_setenv( const char * szName, const char * szValue )
return SetEnvironmentVariableA( szName, szValue ) != 0;
#elif defined( _BSD_SOURCE ) || _POSIX_C_SOURCE >= 200112L || \
_XOPEN_SOURCE >= 600 || defined( __WATCOMC__ ) || defined( __DJGPP__ )
_XOPEN_SOURCE >= 600 || defined( __WATCOMC__ ) || defined( __DJGPP__ ) || \
defined( HB_OS_DARWIN )
if( szValue )
return setenv( szName, szValue, 1 ) == 0;

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

@@ -2179,11 +2179,13 @@ STATIC FUNCTION PathSepToSelf( cFileName )
STATIC FUNCTION PathSepToTarget( cFileName, nStart )
DEFAULT nStart TO 0
IF t_cARCH $ "win|dos|os2" .AND. !( t_cCOMP $ "mingw|mingwce|cygwin" )
RETURN StrTran( cFileName, "/", "\", nStart )
RETURN Left( cFileName, nStart ) + StrTran( SubStr( cFileName, nStart + 1 ), "/", "\" )
ENDIF
RETURN StrTran( cFileName, "\", "/", nStart )
RETURN Left( cFileName, nStart ) + StrTran( SubStr( cFileName, nStart + 1 ), "\", "/" )
STATIC FUNCTION DirAddPathSep( cDir )