diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f27f7f2545..863f6d0e3d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,31 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-15 04:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + * include/hbthread.h + * include/hbdefs.h + * include/hbsetup.h + - config/haiku + + config/beos + * config/global.mk + * Changed Haiku's internal name in Harbour to BeOS. + HB_OS_HAIKU -> HB_OS_BEOS + 'haiku' -> 'beos' + * Changed __HAIKU__ guards to HB_OS_BEOS (two occurrences). + Hope this is right. + + * external/libpng/Makefile + * contrib/xhb/hbserv.c + * contrib/hbtpathy/tpunix.c + * contrib/hbsqlit3/Makefile + * config/detect.mk + + Applied 2nd Haiku patch by Tamas Tevesz. + ; Please review hbtpathy patch. + ; I've changed one HB_OS_HAIKU reference to __HAIKU__ since + it looks to be a Haiku specific thing (thus HB_OS_BEOS doesn't + seem appropriate). + 2009-09-15 03:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Extended autodetection of mingw cross-compiler on *nix system. diff --git a/harbour/INSTALL b/harbour/INSTALL index db0e3af975..bba874a4c1 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -321,7 +321,7 @@ SUPPORTED PLATFORMS AND C COMPILERS linux - Linux darwin - Mac OS X bsd - FreeBSD / OpenBSD / NetBSD / *BSD - haiku - Haiku (experimental) + beos - BeOS / Haiku (experimental) hpux - HP-UX sunos - Sun Solaris / OpenSolaris win - MS Windows (all flavors) @@ -353,8 +353,8 @@ SUPPORTED PLATFORMS AND C COMPILERS ---- gcc - GNU C - haiku - ----- + beos + ---- gcc - GNU C sunos @@ -986,7 +986,7 @@ BUILD HOST-PLATFORM/SHELL - TARGET-PLATFORM/COMPILER COMPATIBILITY MATRIX x darwin -> win/mingw x86 x darwin -> dos/djgpp x86 hpux -> hpux/gcc (CPU cross-builds possible) - haiku -> haiku/gcc x86 + beos -> beos/gcc x86 x hpux -> wce/mingwarm arm x hpux -> wce/mingw x86 x hpux -> win/mingw x86 diff --git a/harbour/config/haiku/gcc.mk b/harbour/config/beos/gcc.mk similarity index 100% rename from harbour/config/haiku/gcc.mk rename to harbour/config/beos/gcc.mk diff --git a/harbour/config/haiku/global.mk b/harbour/config/beos/global.mk similarity index 100% rename from harbour/config/haiku/global.mk rename to harbour/config/beos/global.mk diff --git a/harbour/config/haiku/libs.mk b/harbour/config/beos/libs.mk similarity index 100% rename from harbour/config/haiku/libs.mk rename to harbour/config/beos/libs.mk diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index 2b59118dd9..410a420486 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -73,7 +73,7 @@ _DET_VAR_INC_ := HB_INC_OPENSSL _DET_VAR_HAS_ := HB_HAS_OPENSSL _DET_FLT_PLAT := _DET_FLT_COMP := !watcom -_DET_INC_DEFP := /usr/include /usr/local/ssl/include +_DET_INC_DEFP := /usr/include /usr/local/ssl/include /boot/common/include _DET_INC_HEAD := /openssl/ssl.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/config/global.mk b/harbour/config/global.mk index a3c09fb9b8..69fc2a36fb 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -109,9 +109,9 @@ define check_host else ifneq ($(findstring msdos,$(1)),) HB_HOST_PLAT := dos else ifneq ($(findstring beos,$(1)),) - HB_HOST_PLAT := haiku + HB_HOST_PLAT := beos else ifneq ($(findstring Haiku,$(1)),) - HB_HOST_PLAT := haiku + HB_HOST_PLAT := beos endif endef @@ -822,7 +822,7 @@ ifeq ($(HB_COMPILER),) endif endif else - ifeq ($(HB_PLATFORM),haiku) + ifeq ($(HB_PLATFORM),beos) HB_COMP_PATH := $(call find_in_path,gcc) ifneq ($(HB_COMP_PATH),) HB_COMPILER := gcc diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile index 4a5c5440fa..3a3ad7d3fc 100644 --- a/harbour/contrib/hbsqlit3/Makefile +++ b/harbour/contrib/hbsqlit3/Makefile @@ -19,7 +19,7 @@ _DET_VAR_INC_ := HB_INC_SQLITE3 _DET_VAR_HAS_ := HB_HAS_SQLITE3 _DET_FLT_PLAT := _DET_FLT_COMP := -_DET_INC_DEFP := /usr/include +_DET_INC_DEFP := /usr/include /boot/common/include _DET_INC_LOCL := $(TOP)$(ROOT)external/sqlite3 _DET_INC_HEAD := /sqlite3.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/contrib/hbtpathy/tpunix.c b/harbour/contrib/hbtpathy/tpunix.c index 236eb3f0d4..4a406fc2e1 100644 --- a/harbour/contrib/hbtpathy/tpunix.c +++ b/harbour/contrib/hbtpathy/tpunix.c @@ -125,8 +125,10 @@ HB_FUNC( __TP_INITPORTSPEED ) /* Enable the receiver and set local mode... */ options.c_cflag |= ( CLOCAL | CREAD ); +#if defined( cfmakeraw ) /* Raw input from device */ cfmakeraw( &options ); +#endif /* Reset data bits ( cfmakeraw() puts it to CS8 ) */ options.c_cflag &= ~CSIZE; @@ -219,41 +221,49 @@ HB_FUNC( __TP_OUTFREE ) HB_FUNC( __TP_ISDCD ) { +#if defined( TIOCMGET ) int status; if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 ) hb_retl( ( status & TIOCM_CD ) == TIOCM_CD ); else +#endif hb_retl( FALSE ); } HB_FUNC( __TP_ISRI ) { +#if defined( TIOCMGET ) int status; if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 ) hb_retl( ( status & TIOCM_RI ) == TIOCM_RI ); else +#endif hb_retl( FALSE ); } HB_FUNC( __TP_ISDSR ) { +#if defined( TIOCMGET ) int status; if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 ) hb_retl( ( status & TIOCM_DSR ) == TIOCM_DSR ); else +#endif hb_retl( FALSE ); } HB_FUNC( __TP_ISCTS ) { +#if defined( TIOCMGET ) int status; if ( ioctl( hb_parnl( 1 ), TIOCMGET, &status ) == 0 ) hb_retl( ( status & TIOCM_CTS ) == TIOCM_CTS ); else +#endif hb_retl( FALSE ); } diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c index 59fa4d564e..4c083f2340 100644 --- a/harbour/contrib/xhb/hbserv.c +++ b/harbour/contrib/xhb/hbserv.c @@ -68,7 +68,9 @@ !defined( HB_OS_DARWIN_5 ) && \ ! ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) && \ !defined( HB_OS_WIN_64 ) && \ - ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) ) + ( !defined( HB_OS_OS2 ) || defined( HB_OS_OS2_GCC ) ) && \ + !defined( __HAIKU__ ) +/* TODO: Haiku will supposedly do this later on, read /boot/develop/headers/posix/signal.h */ #if defined( HB_OS_UNIX ) || defined( HB_OS_OS2_GCC ) #include diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile index 327503dd9a..10f3c31e33 100644 --- a/harbour/external/libpng/Makefile +++ b/harbour/external/libpng/Makefile @@ -42,7 +42,7 @@ ifeq ($(HB_SUPPORTED),yes) _DET_VAR_HAS_ := HB_HAS_PNG _DET_FLT_PLAT := _DET_FLT_COMP := - _DET_INC_DEFP := /usr/include + _DET_INC_DEFP := /usr/include /boot/develop/headers/3rdparty _DET_INC_LOCL := $(TOP)$(ROOT)external/libpng _DET_INC_HEAD := /png.h include $(TOP)$(ROOT)config/detfun.mk diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index de784fb18d..f172cad29d 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -78,7 +78,7 @@ ( defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L ) || \ ( defined( __DJGPP__ ) && \ ( __DJGPP__ > 2 || ( __DJGPP__ == 2 && __DJGPP_MINOR__ >= 4 ) ) ) || \ - defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) || defined( HB_OS_SUNOS ) || defined( HB_OS_HAIKU ) ) ) + defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) || defined( HB_OS_SUNOS ) || defined( HB_OS_BEOS ) ) ) #include /* workaround for BCC 5.8 bug */ #if ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 ) diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 5eb50c84f4..bcc7532741 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -279,9 +279,9 @@ #endif #endif -#ifndef HB_OS_HAIKU +#ifndef HB_OS_BEOS #if defined( __HAIKU__ ) - #define HB_OS_HAIKU + #define HB_OS_BEOS #endif #endif @@ -291,7 +291,7 @@ defined( HB_OS_BSD ) || \ defined( HB_OS_SUNOS ) || \ defined( HB_OS_HPUX ) || \ - defined( HB_OS_HAIKU ) + defined( HB_OS_BEOS ) #define HB_OS_UNIX /* Compatibility. Do not use this. */ #ifdef HB_LEGACY_LEVEL2 diff --git a/harbour/include/hbthread.h b/harbour/include/hbthread.h index 38b8a97070..8645e0ffbb 100644 --- a/harbour/include/hbthread.h +++ b/harbour/include/hbthread.h @@ -63,7 +63,7 @@ # define HB_TASK_THREAD #elif defined( HB_OS_LINUX ) || defined( HB_OS_DARWIN ) || \ defined( HB_OS_SUNOS ) || defined( HB_OS_HPUX ) || \ - defined( HB_OS_HAIKU ) + defined( HB_OS_BEOS ) # include # define HB_PTHREAD_API #elif defined( HB_OS_WIN ) diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c index c2c781785d..20b850f91b 100644 --- a/harbour/source/common/hbprintf.c +++ b/harbour/source/common/hbprintf.c @@ -284,7 +284,7 @@ optimized. # else # define _x_long_dbl long double # if defined( __WATCOMC__ ) || defined( __MINGW32CE__ ) || defined( __CYGWIN__ ) || \ - ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) || defined( __HAIKU__ ) + ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) || defined( HB_OS_BEOS ) # define _HB_WRAP_MODFL_ # define _MODFD( x, p ) _hb_modfl( x, p ) # else diff --git a/harbour/source/rtl/hbsocket.c b/harbour/source/rtl/hbsocket.c index 293623c555..4a6aaecaa2 100644 --- a/harbour/source/rtl/hbsocket.c +++ b/harbour/source/rtl/hbsocket.c @@ -113,7 +113,7 @@ #if defined( HB_OS_UNIX ) && ! defined( __CYGWIN__ ) # define HB_HAS_UNIX -# if !defined( __WATCOMC__ ) && !defined( __HAIKU__ ) +# if !defined( __WATCOMC__ ) && !defined( HB_OS_BEOS ) # define HB_HAS_INET_ATON # define HB_HAS_INET_PTON # define HB_HAS_INET_NTOP