bk commit into 6.0 tree (df:1.2551)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
6.0 repository of df.  When df does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-14 21:53:25+01:00, df@stripped +1 -0
  Sorry, we still need this old code for Windows.

  include/my_net.h@stripped, 2008-02-14 21:53:22+01:00, df@stripped +9 -0
    Back this back in for ... guess ... Windows. 

diff -Nrup a/include/my_net.h b/include/my_net.h
--- a/include/my_net.h	2008-01-05 00:49:04 +01:00
+++ b/include/my_net.h	2008-02-14 21:53:22 +01:00
@@ -64,6 +64,15 @@ C_MODE_START
 
 #endif
 
+/*
+  On OSes which don't have the in_addr_t, we guess that using uint32 is the best
+  possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit
+  & Solaris64bit, in_addr_t is equivalent to uint32. And on Linux32bit too.
+*/
+#ifndef HAVE_IN_ADDR_T
+#define in_addr_t uint32
+#endif
+
 /* Thread safe or portable version of some functions */
 
 void my_inet_ntoa(struct in_addr in, char *buf);