Dep/MySQL: Updated MySQL sources to version 5.5.9 (current GA)

dep/mysqllite/include/my_net.h

@@ -14,9 +14,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
-  thread safe version of some common functions:
-  my_inet_ntoa
-
   This file is also used to make handling of sockets and ioctl()
   portable accross systems.
 
@@ -24,6 +21,9 @@
 
 #ifndef _my_net_h
 #define _my_net_h
+
+#include "my_global.h"                  /* C_MODE_START, C_MODE_END */
+
 C_MODE_START
 
 #include <errno.h>
@@ -43,7 +43,7 @@ C_MODE_START
 #include <sys/ioctl.h>
 #endif
 
-#if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)
+#if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES)
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
@@ -73,22 +73,10 @@ C_MODE_START
 #define in_addr_t uint32
 #endif
 
-/* On some operating systems (e.g. Solaris) INADDR_NONE is not defined */
-#ifndef INADDR_NONE
-#define INADDR_NONE -1                          /* Error value from inet_addr */
-#endif
-
-/* Thread safe or portable version of some functions */
-
-void my_inet_ntoa(struct in_addr in, char *buf);
-
 /*
   Handling of gethostbyname_r()
 */
 
-#if !defined(HPUX10)
-struct hostent;
-#endif /* HPUX */
 #if !defined(HAVE_GETHOSTBYNAME_R)
 struct hostent *my_gethostbyname_r(const char *name,
 				   struct hostent *result, char *buffer,
@@ -118,11 +106,5 @@ struct hostent *my_gethostbyname_r(const char *name,
 #define GETHOSTBYNAME_BUFF_SIZE 2048
 #endif
 
-/* On SCO you get a link error when refering to h_errno */
-#ifdef SCO
-#undef h_errno
-#define h_errno errno
-#endif
-
 C_MODE_END
 #endif