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

2008-08-25 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* include/hbsetup.h
     ! Fixed OS_UNIX_COMPATIBLE
     + Small comments added.
     ; NOTE: I'd like to do the following global renames:
             HB_WINCE     -> HB_OS_WIN_CE
             HB_OS_WIN_32 -> HB_OS_WIN
             Opinions? Especially on the latter.

   * include/hbdefs.h
   * include/hbinit.h
   * contrib/hbodbc/odbc.c
     * _WIN64 -> HB_OS_WIN_64
This commit is contained in:
Viktor Szakats
2008-08-25 21:06:51 +00:00
parent 90207c5539
commit a0dbcc4b5b
5 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
harbour/ChangeLog
View File

@@ -8,6 +8,20 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-08-25 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbsetup.h
! Fixed OS_UNIX_COMPATIBLE
+ Small comments added.
; NOTE: I'd like to do the following global renames:
HB_WINCE -> HB_OS_WIN_CE
HB_OS_WIN_32 -> HB_OS_WIN
Opinions? Especially on the latter.
* include/hbdefs.h
* include/hbinit.h
* contrib/hbodbc/odbc.c
* _WIN64 -> HB_OS_WIN_64
2008-08-25 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* make_vcce.mak
! Do not explicitly #define HB_WINCE. This should be

4
harbour/contrib/hbodbc/odbc.c
View File

@@ -97,14 +97,14 @@
#endif
#ifndef SQLLEN
#ifdef _WIN64
#ifdef HB_OS_WIN_64
typedef INT64 SQLLEN;
#else
#define SQLLEN SQLINTEGER
#endif
#endif
#ifndef SQLULEN
#ifdef _WIN64
#ifdef HB_OS_WIN_64
typedef UINT64 SQLULEN;
#else
#define SQLULEN SQLUINTEGER

10
harbour/include/hbdefs.h
View File

@@ -84,8 +84,8 @@
#define HB_LONG_LONG_OFF
*/
#if defined( HB_OS_WIN_32 ) || defined( _WIN64 )
#if defined( _WIN64 )
#if defined( HB_OS_WIN_32 ) || defined( HB_OS_WIN_64 )
#if defined( HB_OS_WIN_64 )
#undef HB_LONG_LONG_OFF
#define HB_STRICT_ALIGNMENT
#if !defined( HB_OS_WIN_32 )
@@ -286,7 +286,7 @@
* below are some hacks which don't have to be true on some machines
* please update it if necessary
*/
#if defined( _WIN64 )
#if defined( HB_OS_WIN_64 )
# define HB_ARCH_64BIT
#elif ULONG_MAX > UINT_MAX && UINT_MAX > USHRT_MAX
# define HB_ARCH_64BIT
@@ -361,7 +361,7 @@
# define INT24_MIN -8388608L
#endif
#if defined( HB_ARCH_64BIT ) && !defined( _WIN64 )
#if defined( HB_ARCH_64BIT ) && !defined( HB_OS_WIN_64 )
# if !defined( UINT64 )
typedef ULONG UINT64;
# endif
@@ -531,7 +531,7 @@ typedef unsigned long HB_COUNTER;
#endif
/* type for memory pointer diff */
#if defined( _WIN64 )
#if defined( HB_OS_WIN_64 )
typedef LONGLONG HB_PTRDIFF;
#else
typedef long HB_PTRDIFF;

2
harbour/include/hbinit.h
View File

@@ -60,7 +60,7 @@ HB_EXTERN_BEGIN
extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols ); /* old module symbols initialization */
extern HB_EXPORT PHB_SYMB hb_vmProcessSymbolsEx( PHB_SYMB pSymbols, USHORT uiSymbols, char * szModuleName, ULONG ulID, USHORT uiPcodeVer ); /* module symbols initialization with extended information */
#if defined(_MSC_VER) && !defined(_WIN64) && \
#if defined(_MSC_VER) && !defined(HB_OS_WIN_64) && \
!defined(__LCC__) && !defined(__POCC__) && !defined(__XCC__) && \
!defined(HB_STRICT_ANSI_C) && !defined(HB_STATIC_STARTUP) && \
!defined(HB_PRAGMA_STARTUP) && !defined(HB_MSC_STARTUP)

18
harbour/include/hbsetup.h
View File

@@ -229,13 +229,6 @@
#define HB_ISOPTSEP( c ) ( strchr( HB_OS_OPT_DELIM_LIST, ( c ) ) != NULL )
/* Compatibility #defines. These will be removed, so
please use the new names in your code. */
#ifdef HB_LEGACY_LEVEL
#define OS_UNIX_COMPATIBLE HB_OS_UNIX_COMPATIBLE
#define OS_PATH_DELIMITER HB_OS_PATH_DELIM_CHR
#endif
/* ***********************************************************************
* Platform detection
*/
@@ -282,12 +275,14 @@
#endif
#endif
/* Sub-option inside HB_OS_WIN_32 */
#ifndef HB_OS_WIN_64
#if defined(_WIN64)
#define HB_OS_WIN_64
#endif
#endif
/* Sub-option inside HB_OS_WIN_32 */
#ifndef HB_WINCE
#if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__)
#define HB_WINCE
@@ -348,6 +343,15 @@
#define HB_OS_EOL_LEN 2
#endif
/* Compatibility #defines. These will be removed, so
please use the new names in your code. */
#ifdef HB_LEGACY_LEVEL
#define OS_PATH_DELIMITER HB_OS_PATH_DELIM_CHR
#ifdef HB_OS_UNIX_COMPATIBLE
#define OS_UNIX_COMPATIBLE
#endif
#endif
/* ***********************************************************************
* See also the following files for task specific definitions/settings
*