From 9b70178aee73ed39cf8d9d129c3b1db4959341c6 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 25 Jan 2011 14:28:48 +0000
Subject: [PATCH] 2011-01-25 15:26 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbnetio/utils/netiosrv/netiosrv.hbp     ! Corrected
 relative path to hbnetio.hbc

  * contrib/hbnetio/hbnetio.hbc
    ! Added missing incpath option.

  * contrib/hbnetio/hbnetio.ch
  * contrib/hbnetio/netiosrv.c
    ! Typo: NETIO_SRVINFO_PEERADDRES -> NETIO_SRVINFO_PEERADDRESS

  * contrib/hbnetio/netiosrv.c
    - Deleted: NETIO_OPENFILESCOUNT().
    ; TODO: Pls update netiosrq to use the new interface.
            Same for netiosrv. I'll do it in next commit.

  * contrib/hbnetio/hbnetio.ch
    ! Added notice that this .ch file is used also by .c code.
---
 harbour/ChangeLog                             | 19 +++++++++++++++++++
 harbour/contrib/hbnetio/hbnetio.ch            |  4 +++-
 harbour/contrib/hbnetio/hbnetio.hbc           |  2 ++
 harbour/contrib/hbnetio/netiosrv.c            | 12 +-----------
 .../hbnetio/utils/netiosrv/netiosrv.hbp       |  2 +-
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ef5147eb0d..bf7b3e8fb1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-25 15:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbnetio/utils/netiosrv/netiosrv.hbp
+    ! Corrected relative path to hbnetio.hbc
+
+  * contrib/hbnetio/hbnetio.hbc
+    ! Added missing incpath option.
+
+  * contrib/hbnetio/hbnetio.ch
+  * contrib/hbnetio/netiosrv.c
+    ! Typo: NETIO_SRVINFO_PEERADDRES -> NETIO_SRVINFO_PEERADDRESS
+
+  * contrib/hbnetio/netiosrv.c
+    - Deleted: NETIO_OPENFILESCOUNT().
+    ; TODO: Pls update netiosrq to use the new interface.
+            Same for netiosrv. I'll do it in next commit.
+
+  * contrib/hbnetio/hbnetio.ch
+    ! Added notice that this .ch file is used also by .c code.
+
 2011-01-25 14:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapiitm.h
   * harbour/src/vm/itemapi.c
diff --git a/harbour/contrib/hbnetio/hbnetio.ch b/harbour/contrib/hbnetio/hbnetio.ch
index 5c282c24be..9e64d32303 100644
--- a/harbour/contrib/hbnetio/hbnetio.ch
+++ b/harbour/contrib/hbnetio/hbnetio.ch
@@ -50,6 +50,8 @@
  *
  */
 
+/* NOTE: This file is also used by C code. */
+
 #ifndef HBNETIO_CH_
 #define HBNETIO_CH_
 
@@ -79,6 +81,6 @@
 #define NETIO_SRVINFO_FILESCOUNT    -1
 #define NETIO_SRVINFO_BYTESSENT     -2
 #define NETIO_SRVINFO_BYTESRECEIVED -3
-#define NETIO_SRVINFO_PEERADDRES    -4
+#define NETIO_SRVINFO_PEERADDRESS   -4
 
 #endif /* HBNETIO_CH_ */
diff --git a/harbour/contrib/hbnetio/hbnetio.hbc b/harbour/contrib/hbnetio/hbnetio.hbc
index 86f6254c46..29bd564988 100644
--- a/harbour/contrib/hbnetio/hbnetio.hbc
+++ b/harbour/contrib/hbnetio/hbnetio.hbc
@@ -2,4 +2,6 @@
 # $Id$
 #
 
+incpaths=.
+
 libs=${hb_name}${__HB_DYN__}
diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c
index 923e92b4ae..b5872468d9 100644
--- a/harbour/contrib/hbnetio/netiosrv.c
+++ b/harbour/contrib/hbnetio/netiosrv.c
@@ -1404,7 +1404,7 @@ HB_FUNC( NETIO_SRVSTATUS )
       case NETIO_SRVINFO_BYTESRECEIVED:
          hb_stornint( conn->rd_count, 3 );
          break;
-      case NETIO_SRVINFO_PEERADDRES:
+      case NETIO_SRVINFO_PEERADDRESS:
       {
          void * addr;
          unsigned int len;
@@ -1429,13 +1429,3 @@ HB_FUNC( NETIO_SRVSOCKET )
    if( conn )
       hb_socketItemPut( hb_stackReturnItem(), conn->sd );
 }
-
-HB_FUNC( NETIO_SRVOPENFILESCOUNT )
-{
-   PHB_CONSRV conn = s_consrvParam( 1 );
-
-   if( conn )
-      hb_retni( conn->filesCount );
-   else
-      hb_retni( 0 );
-}
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp b/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
index ca777306f9..c95e909ad9 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
+++ b/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-../hbnetio.hbc
+../../hbnetio.hbc
 -mt
 
 -w3 -es2 -l