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

#ifndef used to avoid Windows.h collisions

Browse Source
This commit is contained in:
Antonio Linares
2001-12-03 10:21:35 +00:00
parent 9d1f2a0d8f
commit 83ed4d33df
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
harbour/include/clipdefs.h
View File

@@ -78,9 +78,11 @@ typedef SHORTP PSHORT;
typedef USHORT * USHORTP;
typedef USHORTP PUSHORT;
typedef unsigned int WORD;
typedef WORD * WORDP;
typedef WORDP PWORD;
#ifndef __HARBOUR__
typedef unsigned int WORD;
typedef WORD * WORDP;
typedef WORDP PWORD;
#endif
typedef LONG * LONGP;
typedef LONGP PLONG;
@@ -98,11 +100,12 @@ typedef BOOLP PBOOL;
typedef void * NEARP;
typedef NEARP * NEARPP;
typedef void * FARP;
typedef FARP * FARPP;
typedef FARP VOIDP;
typedef FARP PVOID;
#ifndef __HARBOUR__
typedef void * FARP;
typedef FARP * FARPP;
typedef FARP VOIDP;
typedef FARP PVOID;
#endif
typedef void * HANDLE;
typedef ERRCODE IHELP;
@@ -122,4 +125,4 @@ typedef FUNCP * FUNCPP;
#define NULL 0
#endif
#endif /* _CLIPDEFS_H */
#endif /* _CLIPDEFS_H */

15
harbour/include/extend.api
View File

@@ -55,7 +55,10 @@
#ifndef _EXTEND_API
#define _EXTEND_API
#include "clipdefs.h"
#ifndef __HARBOUR__
#include "clipdefs.h"
#endif
#include "hbapi.h"
typedef PHB_ITEM ITEM;
@@ -69,16 +72,16 @@ typedef PHB_ITEM ITEM;
#define CHARACTER HB_IT_STRING
#define NUMERIC HB_IT_NUMERIC
#define LOGICAL HB_IT_LOGICAL
#define DATE HB_IT_DATE
// #define DATE HB_IT_DATE
#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 )
// #define WORD ( HB_IT_INTEGER | HB_IT_LONG )
#define ARRAY HB_IT_ARRAY
#define BLOCK HB_IT_BLOCK
#define DOUBLE HB_IT_DOUBLE
// #define DOUBLE HB_IT_DOUBLE
/* Macros */
@@ -115,6 +118,4 @@ typedef PHB_ITEM ITEM;
#define _storni hb_storni
#define _stornl hb_stornl
#endif /* _EXTEND_API */
#endif /* _EXTEND_API */