Update for version 6-40-0002 and re-merge Thomas' changes.

src/interfaces/odbc/socket.h

@@ -21,8 +21,18 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
 #define closesocket(xxx) close(xxx)
 #define SOCKETFD int
+
+#ifndef       INADDR_NONE
+#ifndef _IN_ADDR_T
+#define _IN_ADDR_T
+typedef unsigned int    in_addr_t;
+#endif
+#define INADDR_NONE ((in_addr_t)-1)
+#endif
+
 #else
 #include <winsock.h>
 #define SOCKETFD SOCKET