From 01bf6082c85f75c3fc717c70f1ff2a5d3f1a94aa Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Mon, 3 Dec 2001 14:00:44 +0000 Subject: [PATCH] #ifndef HB_OS_WIN_32 used instead of __HARBOUR__ --- harbour/include/clipdefs.h | 4 ++-- harbour/include/extend.api | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h index 13980f3b75..001dd9b2a0 100644 --- a/harbour/include/clipdefs.h +++ b/harbour/include/clipdefs.h @@ -78,7 +78,7 @@ typedef SHORTP PSHORT; typedef USHORT * USHORTP; typedef USHORTP PUSHORT; -#ifndef __HARBOUR__ +#ifndef HB_OS_WIN_32 typedef unsigned int WORD; typedef WORD * WORDP; typedef WORDP PWORD; @@ -100,7 +100,7 @@ typedef BOOLP PBOOL; typedef void * NEARP; typedef NEARP * NEARPP; -#ifndef __HARBOUR__ +#ifndef HB_OS_WIN_32 typedef void * FARP; typedef FARP * FARPP; typedef FARP VOIDP; diff --git a/harbour/include/extend.api b/harbour/include/extend.api index 0ebaf9cbed..be8d77505a 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -55,7 +55,7 @@ #ifndef _EXTEND_API #define _EXTEND_API -#ifndef __HARBOUR__ +#ifndef HB_OS_WIN_32 #include "clipdefs.h" #endif @@ -72,16 +72,22 @@ typedef PHB_ITEM ITEM; #define CHARACTER HB_IT_STRING #define NUMERIC HB_IT_NUMERIC #define LOGICAL HB_IT_LOGICAL -// #define DATE HB_IT_DATE +#ifndef HB_OS_WIN_32 + #define DATE HB_IT_DATE +#endif #define ALIAS HB_IT_ALIAS #define MPTR HB_IT_BYREF /* or'ed with type when passed by reference */ #define MEMO HB_IT_MEMO /* NOTE: CA-Cl*pper bug: WORD will conflict with the typedef with the same name in clipdefs.h [vszakats] */ -// #define WORD ( HB_IT_INTEGER | HB_IT_LONG ) +#ifndef HB_OS_WIN_32 + #define WORD ( HB_IT_INTEGER | HB_IT_LONG ) +#endif #define ARRAY HB_IT_ARRAY #define BLOCK HB_IT_BLOCK -// #define DOUBLE HB_IT_DOUBLE +#ifndef HB_OS_WIN_32 + #define DOUBLE HB_IT_DOUBLE +#endif /* Macros */