From 474e573e444c377eb39525e290995603d3a9fc71 Mon Sep 17 00:00:00 2001
From: Andi Jahja <xharbour@cbn.net.id>
Date: Wed, 21 Nov 2001 21:41:46 +0000
Subject: [PATCH] Andi Jahja <andijahja@cbn.net.id>

---
 harbour/ChangeLog               | 6 ++++++
 harbour/contrib/libnf/getvid.c  | 2 +-
 harbour/source/common/hbfsapi.c | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cd82f2358a..ddbc79eb7b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-22 04:45 GMT+0700 Andi Jahja <harbour@cbn.net.id>
+   * contrib/libnf/getvid.c
+     ! HB_FUNC(_V_SETVPG), use int iPage only if HB_OS_DOS is defined
+   * source/common/hbfsapi.c
+     ! undefine _NFILE_ before redefining (was defined in BCC's _nfile.h)
+
 2001-11-21 16:40 GMT-3 Horacio Roldan <harbour_ar@yahoo.com.ar>
    * source/rdd/dbfcdx/dbfcdx1.c
      ! fixed eof() bug
diff --git a/harbour/contrib/libnf/getvid.c b/harbour/contrib/libnf/getvid.c
index b662caf56c..538364de91 100644
--- a/harbour/contrib/libnf/getvid.c
+++ b/harbour/contrib/libnf/getvid.c
@@ -76,9 +76,9 @@ HB_FUNC(_FT_GETVPG)
 
 HB_FUNC(_V_SETVPG)
 {
-   int iPage;
 #if defined(HB_OS_DOS)
    {
+      int iPage;
       union REGS registers;
       iPage=hb_parni(1);
       regs.h.ah=0x05;
diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c
index 8d3da72837..95a5028d46 100644
--- a/harbour/source/common/hbfsapi.c
+++ b/harbour/source/common/hbfsapi.c
@@ -55,6 +55,9 @@
 
 #if defined(__BORLANDC__)
 #define ___NFILE_H
+#ifdef _NFILE_
+  #undef _NFILE_
+#endif
 #define _NFILE_ 600
 
 #include <fcntl.h>