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

2010-02-23 09:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbdefs.h
    + <windows.h>/<os2.h> header inclusion (along with HB_OS_WIN_USED
      macro) is now guarded with HB_LEGACY_LEVEL3.

  * include/hbsetup.ch
  * include/hbdefs.h
  * include/clipdefs.h
    + HB_LEGACY_OFF will now turn off legacy types as well.
      This means that HB_LEGACY_TYPES_OFF macro usage
      is now clean.

  * utils/hbmk2/examples/contribf.hbc
    ! hbbmcdx -> rddbmcdx
This commit is contained in:
Viktor Szakats
2010-02-23 08:46:31 +00:00
parent 02af7454a4
commit ef2727d113
5 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -17,6 +17,21 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-02-23 09:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbdefs.h
+ <windows.h>/<os2.h> header inclusion (along with HB_OS_WIN_USED
macro) is now guarded with HB_LEGACY_LEVEL3.
* include/hbsetup.ch
* include/hbdefs.h
* include/clipdefs.h
+ HB_LEGACY_OFF will now turn off legacy types as well.
This means that HB_LEGACY_TYPES_OFF macro usage
is now clean.
* utils/hbmk2/examples/contribf.hbc
! hbbmcdx -> rddbmcdx
2010-02-23 09:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/Makefile
- Deleted hbzlib.h (wrapper for zlib.h)

14
harbour/include/clipdefs.h
View File

@@ -62,7 +62,7 @@
/* New types */
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
typedef unsigned char BYTE;
#endif
typedef BYTE * BYTEP;
@@ -71,7 +71,7 @@ typedef BYTEP BYTEPP;
typedef BYTEP PBYTE;
#endif
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
typedef short SHORT;
#endif
typedef SHORT * SHORTP;
@@ -79,7 +79,7 @@ typedef SHORT * SHORTP;
typedef SHORTP PSHORT;
#endif
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
typedef unsigned short USHORT;
#endif
typedef USHORT * USHORTP;
@@ -93,7 +93,7 @@ typedef WORD * WORDP;
typedef WORDP PWORD;
#endif
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
typedef long LONG;
#endif
typedef LONG * LONGP;
@@ -101,7 +101,7 @@ typedef LONG * LONGP;
typedef LONGP PLONG;
#endif
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
typedef unsigned long ULONG;
#endif
typedef ULONG * ULONGP;
@@ -113,7 +113,7 @@ typedef unsigned long DWORD;
typedef DWORD * DWORDP;
typedef DWORDP PDWORD;
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && defined( HB_LEGACY_TYPES_OFF )
#if !( defined( HB_OS_OS2 ) && defined( HB_DONT_DEFINE_BASIC_TYPES ) ) && ( defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 ) )
#undef BOOL
typedef USHORT BOOL;
#endif
@@ -147,7 +147,7 @@ typedef FUNCP * FUNCPP;
#define HIDE static
#define CLIPPER HARBOUR
#if defined( HB_LEGACY_TYPES_OFF )
#if defined( HB_LEGACY_TYPES_OFF ) || ! defined( HB_LEGACY_LEVEL3 )
# undef FALSE
# define FALSE 0
# undef TRUE

19
harbour/include/hbdefs.h
View File

@@ -102,18 +102,17 @@
#endif
#else
#undef HB_IO_WIN
#undef HB_OS_WIN_USED
#endif
/* Include windows.h if applicable and requested */
#if defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED )
#if defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) && defined( HB_LEGACY_LEVEL3 )
#include <windows.h>
#if defined( __GNUC__ )
#define HB_DONT_DEFINE_BASIC_TYPES
#endif
#elif defined( HB_OS_OS2 ) && ! defined( HB_LEGACY_TYPES_OFF )
#elif defined( HB_OS_OS2 ) && ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
/* With the exception of WORD, the OS/2 header has its
own definitions of the Harbour types most of which conflict with the
@@ -201,7 +200,7 @@ typedef HB_UCHAR HB_U8;
/* Convenience */
typedef HB_UCHAR HB_BYTE;
#if ! defined( HB_LEGACY_TYPES_OFF )
#if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
#if ! defined( HB_DONT_DEFINE_BASIC_TYPES )
#if ! defined( HB_DONT_DEFINE_BOOL )
@@ -268,7 +267,7 @@ typedef HB_UCHAR HB_BYTE;
typedef unsigned long long HB_ULONGLONG;
#endif
#if ! defined( HB_LEGACY_TYPES_OFF )
#if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
#if ! defined( HB_DONT_DEFINE_BASIC_TYPES ) && ! defined( _WINNT_H )
#if !defined( LONGLONG )
#if defined( HB_OS_WIN ) && !defined( __GNUC__ )
@@ -343,7 +342,7 @@ typedef HB_UCHAR HB_BYTE;
#define HB_I16_MIN SHRT_MIN
#define HB_I16_MAX SHRT_MAX
#define HB_U16_MAX USHRT_MAX
# if ! defined( HB_LEGACY_TYPES_OFF )
# if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
# if !defined( UINT16 )
typedef HB_U16 UINT16;
# endif
@@ -374,7 +373,7 @@ typedef HB_UCHAR HB_BYTE;
#define HB_I32_MIN INT_MIN
#define HB_I32_MAX INT_MAX
#define HB_U32_MAX UINT_MAX
# if ! defined( HB_LEGACY_TYPES_OFF )
# if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
# if !defined( UINT32 )
typedef HB_U32 UINT32;
# endif
@@ -397,7 +396,7 @@ typedef HB_UCHAR HB_BYTE;
#define HB_I32_MIN LONG_MIN
#define HB_I32_MAX LONG_MAX
#define HB_U32_MAX ULONG_MAX
# if ! defined( HB_LEGACY_TYPES_OFF )
# if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
# if !defined( UINT32 )
typedef HB_U32 UINT32;
# endif
@@ -435,7 +434,7 @@ typedef HB_UCHAR HB_BYTE;
#define HB_I64_MIN LONG_MIN
#define HB_I64_MAX LONG_MAX
#define HB_U64_MAX ULONG_MAX
# if ! defined( HB_LEGACY_TYPES_OFF )
# if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
# if !defined( UINT64 )
typedef HB_U64 UINT64;
# endif
@@ -458,7 +457,7 @@ typedef HB_UCHAR HB_BYTE;
#define HB_I64_MIN LONGLONG_MIN
#define HB_I64_MAX LONGLONG_MAX
#define HB_U64_MAX ULONGLONG_MAX
# if ! defined( HB_LEGACY_TYPES_OFF )
# if ! defined( HB_LEGACY_TYPES_OFF ) && defined( HB_LEGACY_LEVEL3 )
# if !defined( UINT64 )
typedef HB_U64 UINT64;
# endif

2
harbour/include/hbsetup.ch
View File

@@ -73,8 +73,6 @@
*/
#ifndef HB_LEGACY_OFF
#define HB_LEGACY_LEVEL3
#else
#define HB_LEGACY_TYPES_OFF
#endif
/* Future level of legacy cleanup */

2
harbour/utils/hbmk2/examples/contribf.hbc
View File

@@ -6,7 +6,7 @@
# [ This should be kept in sync with local Makefile information. ]
# contribs portable, with no external dependencies:
libs=hbbmcdx hbbtree hbclipsm hbct hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbxpp hbziparc rddsql xhb
libs=hbbtree hbclipsm hbct hbfship hbgt hbmisc hbmzip hbnf hbtpathy hbxpp hbziparc rddbmcdx rddsql xhb
# contribs portable, with external dependencies:
libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg