From 83ed4d33dfeaeb5a5c2fdb0b6657644930a97372 Mon Sep 17 00:00:00 2001
From: Antonio Linares <alinares@fivetechsoft.com>
Date: Mon, 3 Dec 2001 10:21:35 +0000
Subject: [PATCH] #ifndef used to avoid Windows.h collisions

---
 harbour/include/clipdefs.h | 21 ++++++++++++---------
 harbour/include/extend.api | 15 ++++++++-------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h
index f92fdb2d0d..13980f3b75 100644
--- a/harbour/include/clipdefs.h
+++ b/harbour/include/clipdefs.h
@@ -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 */
\ No newline at end of file
diff --git a/harbour/include/extend.api b/harbour/include/extend.api
index 3d8cf6b530..0ebaf9cbed 100644
--- a/harbour/include/extend.api
+++ b/harbour/include/extend.api
@@ -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 */
\ No newline at end of file