bk commit into 5.0 tree (stewart:1.2598)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart.  When stewart 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-04-07 15:47:07+10:00, stewart@willster.(none) +3 -0
  fix OSX build issue, correct spelling of NAVITE (err.. NATIVE)

  include/my_socket_posix.h@stripped, 2008-04-07 15:47:06+10:00, stewart@willster.(none) +2 -1
    #include netinet/in.h for struct sockaddr_in and friends (OSX build)
    s/NAVITE/NATIVE/ 

  include/my_socket_win32.h@stripped, 2008-04-07 15:47:06+10:00, stewart@willster.(none) +1 -1
    s/NAVITE/NATIVE

  vio/viosocket.c@stripped, 2008-04-07 15:47:06+10:00, stewart@willster.(none) +1 -1
    s/NAVITE/NATIVE

diff -Nrup a/include/my_socket_posix.h b/include/my_socket_posix.h
--- a/include/my_socket_posix.h	2008-04-05 22:05:58 +11:00
+++ b/include/my_socket_posix.h	2008-04-07 15:47:06 +10:00
@@ -2,6 +2,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <netdb.h>
 
 
@@ -10,7 +11,7 @@
 
 typedef struct { int fd; } my_socket;
 
-#define MY_CONVERT_TO_NAVITE_SOCKET_API_ONLY(x) (x.fd)
+#define MY_CONVERT_TO_NATIVE_SOCKET_API_ONLY(x) ((x).fd)
 
 static inline int my_socket_valid(my_socket s)
 {
diff -Nrup a/include/my_socket_win32.h b/include/my_socket_win32.h
--- a/include/my_socket_win32.h	2008-04-04 15:54:04 +11:00
+++ b/include/my_socket_win32.h	2008-04-07 15:47:06 +10:00
@@ -7,7 +7,7 @@
 
 typedef struct { SOCKET s; } my_socket;
 
-#define MY_CONVERT_TO_NAVITE_SOCKET_API_ONLY(x) (x.s)
+#define MY_CONVERT_TO_NATIVE_SOCKET_API_ONLY(x) ((x).s)
 
 static inline int my_socket_valid(my_socket s)
 {
diff -Nrup a/vio/viosocket.c b/vio/viosocket.c
--- a/vio/viosocket.c	2008-04-04 15:54:05 +11:00
+++ b/vio/viosocket.c	2008-04-07 15:47:06 +10:00
@@ -300,7 +300,7 @@ enum enum_vio_type vio_type(Vio* vio)
 
 MY_NATIVE_SOCKET_TYPE_API_USE_ONLY vio_fd(Vio* vio)
 {
-  return MY_CONVERT_TO_NAVITE_SOCKET_API_ONLY(vio->sd);
+  return MY_CONVERT_TO_NATIVE_SOCKET_API_ONLY(vio->sd);
 }