Style fix - keep os-specific stuff together.

configure.in:
  - move extra bsdi fix up with other os-specific hacks
include/global.h:
  - move extra bsdi fix up with other os-specific hacks

configure.in

@@ -711,6 +711,7 @@ case $SYSTEM_TYPE in
   *bsdi*)
     echo "Adding fix for BSDI"
     CFLAGS="$CFLAGS -D__BSD__"
+    AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t)
     ;;
    *sgi-irix6*)
     if test "$with_named_thread" = "no"
@@ -1177,10 +1178,6 @@ AC_C_BIGENDIAN
 #---START: Used in for client configure
 # Check base type of last arg to accept
 MYSQL_TYPE_ACCEPT
-case "$SYSTEM_TYPE" in
-*bsdi* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_t);;
-* ) AC_DEFINE_UNQUOTED(SOCKOPT_OPTLEN_TYPE, size_socket);;
-esac
 
 #---END:
 # Find where the stack goes

include/global.h

@@ -351,6 +351,10 @@ typedef int	(*qsort_cmp)(const void *,const void *);
 typedef SOCKET_SIZE_TYPE size_socket;
 #endif
 
+#ifndef SOCKOPT_OPTLEN_TYPE
+#define SOCKOPT_OPTLEN_TYPE size_socket
+#endif
+
 /* file create flags */
 
 #ifndef O_SHARE