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

2009-09-15 04:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* 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).
This commit is contained in:
Viktor Szakats
2009-09-15 02:21:41 +00:00
parent 87fce19d25
commit c9e8928d2e
16 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
harbour/ChangeLog
View File

@@ -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.

8
harbour/INSTALL
View File

@@ -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

0
harbour/config/haiku/gcc.mk → harbour/config/beos/gcc.mk
View File

0
harbour/config/haiku/global.mk → harbour/config/beos/global.mk
View File

0
harbour/config/haiku/libs.mk → harbour/config/beos/libs.mk
View File

2
harbour/config/detect.mk
View File

@@ -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

6
harbour/config/global.mk
View File

@@ -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

2
harbour/contrib/hbsqlit3/Makefile
View File

@@ -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

10
harbour/contrib/hbtpathy/tpunix.c
View File

@@ -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 );
}

4
harbour/contrib/xhb/hbserv.c
View File

@@ -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 <sys/types.h>

2
harbour/external/libpng/Makefile vendored
View File

@@ -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

2
harbour/include/hbdefs.h
View File

@@ -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 <stdint.h>
/* workaround for BCC 5.8 bug */
#if ( defined( __BORLANDC__ ) && __BORLANDC__ >= 1410 )

6
harbour/include/hbsetup.h
View File

@@ -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

2
harbour/include/hbthread.h
View File

@@ -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 <pthread.h>
# define HB_PTHREAD_API
#elif defined( HB_OS_WIN )

2
harbour/source/common/hbprintf.c
View File

@@ -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

2
harbour/source/rtl/hbsocket.c
View File

@@ -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