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

@@ -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

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

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