winport:

- fix compilation with define EXPERIMENTAL_WIFI (winsock2)

desmume/src/common.h

@@ -28,6 +28,7 @@
 #include "types.h"
 	
 #ifdef WIN32
+#define _WINSOCKAPI_
 #include <windows.h>
 
 #define CLASSNAME "DeSmuME"

desmume/src/windows/AboutBox.cpp

@@ -19,7 +19,7 @@
 */
 
 
-#include <windows.h>
+#include "../common.h"
 
 #include "AboutBox.h"
 #include "resource.h"

desmume/src/windows/CWindow.h

@@ -22,7 +22,7 @@
 #ifndef CWINDOW_H
 #define CWINDOW_H
 
-#include <windows.h>
+#include "../common.h"
 
 class WINCLASS
 {

desmume/src/windows/FirmConfig.cpp

@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <windows.h>
+#include "../common.h"
 #include <mmsystem.h>
 #include <COMMDLG.H>
 #include <string.h>
@@ -31,7 +31,6 @@
 #include "FirmConfig.h"
 
 #include "../debug.h"
-#include "../common.h"
 #include "../NDSSystem.h"
 
 static char nickname_buffer[11];

desmume/src/windows/IORegView.h

@@ -21,7 +21,7 @@
 
 #ifndef IO_REG_H
 #define IO_REG_H
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK IoregView_Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 

desmume/src/windows/colorctrl.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../common.h"
 #include <stdio.h>
 #include "colorctrl.h"
 

desmume/src/windows/console.cpp

@@ -21,7 +21,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <windows.h>
+#include "../common.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>

desmume/src/windows/console.h

@@ -22,7 +22,7 @@
 */
 #ifndef _CONSOLE_H_
 #define _CONSOLE_H_
-#include <windows.h>
+#include "../common.h"
 #include <stdio.h>
 #include "debug.h"
 

desmume/src/windows/disView.h

@@ -22,7 +22,7 @@
 #ifndef DISVIEW_H
 #define DISVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK ViewDisasm_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 extern LRESULT CALLBACK ViewDisasm_ARM7BoxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

desmume/src/windows/inputdx.h

@@ -25,7 +25,7 @@
 #define _INPUT_DX_
 
 #define DIRECTINPUT_VERSION 0x0800
-#include <windows.h>
+#include "../common.h"
 #include "..\types.h"
 #include "directx\dinput.h"
 

desmume/src/windows/lightView.h

@@ -20,7 +20,7 @@
 #ifndef LIGHTVIEW_H
 #define LIGHTVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK ViewLightsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
  

desmume/src/windows/mapView.h

@@ -22,7 +22,7 @@
 #ifndef MAPVIEW_H
 #define MAPVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK ViewMapsProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 

desmume/src/windows/matrixView.h

@@ -20,7 +20,7 @@
 #ifndef MATRIXVIEW_H
 #define MATRIXVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK ViewMatricesProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 

desmume/src/windows/memView.h

@@ -22,7 +22,7 @@
 #ifndef MEM_VIEW_H
 #define MEM_VIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern BOOL CALLBACK ViewMem_ARM7Proc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
 extern LRESULT CALLBACK ViewMem_ARM7BoxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

desmume/src/windows/oamView.h

@@ -22,7 +22,7 @@
 #ifndef OAMVIEW_H
 #define OAMVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 
 extern LRESULT CALLBACK ViewOAMBoxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 extern BOOL CALLBACK ViewOAMProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

desmume/src/windows/ogl.cpp

@@ -1,5 +1,5 @@
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "../common.h"
 #include <gl/gl.h>
 #include <gl/glext.h>
 #include "console.h"

desmume/src/windows/palView.h

@@ -22,7 +22,7 @@
 #ifndef PALVIEW_H
 #define PALVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 #include <stdlib.h>
 
 extern BOOL CALLBACK ViewPalProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

desmume/src/windows/throttle.cpp

@@ -1,6 +1,7 @@
 //THIS SPEED THROTTLE IS TAKEN FROM FCEUX.
 //Copyright (C) 2002 Xodnizel
 
+#include "../common.h"
 #include "../types.h"
 #include "../debug.h"
 #include "../console.h"

desmume/src/windows/tileView.h

@@ -22,7 +22,7 @@
 #ifndef TILEVIEW_H
 #define TILEVIEW_H
 
-#include <windows.h>
+#include "../common.h"
 #include <stdlib.h>
 
 extern LRESULT CALLBACK TileViewBoxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

desmume/src/windows/windriver.h

@@ -2,7 +2,7 @@
 #define _WINDRIVER_H_
 
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "../common.h"
 #include "CWindow.h"
 
 extern WINCLASS	*MainWindow;