From 6e3895739e78e5464f5c6a251dd5f09ffd049d83 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 20 Jul 2009 08:21:50 +0000
Subject: [PATCH] 2009-07-20 10:19 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * include/hbapinet.h   * source/rtl/hbinet.c     ! Fixed headers
 for non-Windows.

---
 harbour/ChangeLog           |  5 +++++
 harbour/include/hbapinet.h  | 22 +++++++++++++++++++++-
 harbour/source/rtl/hbinet.c | 19 -------------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8a48343fec..3f23721119 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-20 10:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbapinet.h
+  * source/rtl/hbinet.c
+    ! Fixed headers for non-Windows.
+
 2009-07-20 09:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbssl/hbssl.h
   * contrib/hbssl/sslctx.c
diff --git a/harbour/include/hbapinet.h b/harbour/include/hbapinet.h
index ba5ec52e01..86737b8094 100644
--- a/harbour/include/hbapinet.h
+++ b/harbour/include/hbapinet.h
@@ -63,12 +63,32 @@
 HB_EXTERN_BEGIN
 
 #if defined( HB_OS_WIN )
-   #define _WINSOCKAPI_  /* Prevents inclusion of winsock.h in windows.h */
    #define HB_SOCKET_T SOCKET
+
+   #define _WINSOCKAPI_  /* Prevents inclusion of winsock.h in windows.h */
    #include <winsock2.h>
    #include <windows.h>
 #else
    #define HB_SOCKET_T int
+
+   #include <errno.h>
+   #if defined( HB_OS_OS2 )
+      #if defined( __WATCOMC__ )
+         #include <types.h>
+         #include <nerrno.h>
+      #endif
+      #include <sys/types.h>
+      #include <sys/socket.h>
+      #include <sys/select.h>
+      #include <sys/ioctl.h>
+   #else
+      #include <sys/types.h>
+      #include <sys/socket.h>
+   #endif
+   #include <netdb.h>
+   #include <netinet/in.h>
+   #include <arpa/inet.h>
+   #include <unistd.h>
 #endif
 
 typedef struct _HB_SOCKET
diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c
index daa0903287..e4d825df57 100644
--- a/harbour/source/rtl/hbinet.c
+++ b/harbour/source/rtl/hbinet.c
@@ -90,25 +90,6 @@
          #define _XOPEN_SOURCE_EXTENDED
       #endif
 
-      #include <errno.h>
-#if defined( HB_OS_OS2 )
-      #if defined( __WATCOMC__ )
-         #include <types.h>
-         #include <nerrno.h>
-      #endif
-      #include <sys/types.h>
-      #include <sys/socket.h>
-      #include <sys/select.h>
-      #include <sys/ioctl.h>
-#else
-      #include <sys/types.h>
-      #include <sys/socket.h>
-#endif
-      #include <netdb.h>
-      #include <netinet/in.h>
-      #include <arpa/inet.h>
-      #include <unistd.h>
-
       #if ! defined( h_errno )
          #if defined( __WATCOMC__ )
             #define h_errno errno