Bug #24710065: SPLIT MY_GLOBAL.H

Post-push fix: Unbreak Windows link test, since <windows.h> without
WIN32_LEAN_AND_MEAN (which is used in MySQL, but not in the link test)
pulls in <winsock.h>, which conflicts with our WS2 defines.

Change-Id: I1f158b8a385719f8de0d9d516127a16b7ea7cf9a

Author: Steinar H. Gunderson

include/my_byteorder.h

@@ -1,7 +1,7 @@
 #ifndef MY_BYTEORDER_INCLUDED
 #define MY_BYTEORDER_INCLUDED
 
-/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && defined(WIN32_LEAN_AND_MEAN)
 #include <winsock2.h>
 #endif
 

include/my_io.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,8 +27,10 @@
 #ifdef _WIN32
 /* Include common headers.*/
 # include <io.h>       /* access(), chmod() */
-# include <winsock2.h>
-# include <ws2tcpip.h> /* SOCKET */
+#ifdef WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <ws2tcpip.h> /* SOCKET */
+#endif
 #endif
 
 #ifndef MYSQL_ABI_CHECK

include/mysql/psi/mysql_socket.h

@@ -35,8 +35,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 /* For socket api */
 #ifdef _WIN32
 #include <MSWSock.h>
+#ifdef WIN32_LEAN_AND_MEAN
 #include <winsock2.h>
 #include <ws2def.h>
+#endif
 #define SOCKBUF_T char
 #else
 #include <netinet/in.h>