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

2010-07-17 08:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/hbsocket.c
    + Enabled ioctl() calls for VxWorks.
    ! Worked around 'socklen_t' vs 'int' warnings with VxWorks.
      (still remains some 'const char *' and 'caddr_t' vs 'char *
      warnings, nothing serious though)

  * include/hbthread.h
    ! Enabled HB_CRITICAL_NEED_INIT for VxWorks. Avoids the compiler
      warnings caused by PTHREAD_COND_INITIALIZER having one less 
      structure member than initialized structure.
      MT mode still doesn't work though.

  * contrib/hbodbc/odbc.c
    + Added HB_ODBCVER() function to return build-time ODBC version 
      reported by ODBCVER macro.

  * contrib/hbodbc/tests/testodbc.prg
    + Show ODBC version number.

  - contrib/hbqt/doc/html
    - Deleted. doc dirs now have to abide by the HBDOC rules posted 
      on the dev list, which means doc may contain (non-empty) language 
      dirs only. html should be generated by client app or by install 
      process.

  * contrib/hbwin/hbwinole.h
    ! Patch by Tamas Tevesz, fixing NONAMELESSUNION issue for watcom.
This commit is contained in:
Viktor Szakats
2010-07-17 06:44:19 +00:00
parent 59a9d01559
commit 33b2e5b3fe
6 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/src/rtl/hbsocket.c
View File

@@ -214,9 +214,14 @@
# include <sys/ioctl.h>
# if defined( HB_OS_BEOS )
# include <sys/sockio.h>
# endif
/* NOTE: Hack to avoid collision between stdint.h and unistd.h. [vszakats] */
# if defined( HB_OS_VXWORKS ) && defined( _INTPTR ) && !defined( _INTPTR_T )
# define _INTPTR_T
# endif
# if defined( HB_OS_VXWORKS )
# include <sockLib.h>
# include <ioLib.h>
# endif
# include <netdb.h>
# include <netinet/in.h>
@@ -227,10 +232,6 @@
# include <netinet/tcp.h>
# if !( defined( HB_OS_LINUX ) && defined( __WATCOMC__ ) )
# include <net/if.h>
# endif
/* NOTE: Hack to avoid collision between stdint.h and unistd.h. [vszakats] */
# if defined( HB_OS_VXWORKS ) && defined( _INTPTR ) && !defined( _INTPTR_T )
# define _INTPTR_T
# endif
# include <unistd.h>
# include <fcntl.h>
@@ -243,7 +244,8 @@
#undef HB_OS_WIN
#endif
#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 ) || \
defined( HB_OS_VXWORKS )
# define socklen_t int
#endif
@@ -3015,8 +3017,7 @@ PHB_ITEM hb_socketGetIFaces( int af, HB_BOOL fNoAliases )
* of 'struct ifreq' and SIOCGIF*
*/
#if defined( SIOCGIFCONF ) && \
!( defined( HB_OS_LINUX ) && defined( __WATCOMC__ ) ) && \
! defined( HB_OS_VXWORKS )
!( defined( HB_OS_LINUX ) && defined( __WATCOMC__ ) )
struct ifconf ifc;
struct ifreq * pifr;
char * buf, * ptr;