From ae56e34cc5859fa5ab73ef42354f58076fb6295d Mon Sep 17 00:00:00 2001
From: mtabachenko <mtabachenko@users.sf.net>
Date: Wed, 24 Dec 2008 01:37:18 +0000
Subject: [PATCH] winport: - fix compilation with define EXPERIMENTAL_WIFI
 (winsock2)

---
 desmume/src/common.h               | 1 +
 desmume/src/windows/AboutBox.cpp   | 2 +-
 desmume/src/windows/CWindow.h      | 2 +-
 desmume/src/windows/FirmConfig.cpp | 3 +--
 desmume/src/windows/IORegView.h    | 2 +-
 desmume/src/windows/colorctrl.cpp  | 2 +-
 desmume/src/windows/console.cpp    | 2 +-
 desmume/src/windows/console.h      | 2 +-
 desmume/src/windows/disView.h      | 2 +-
 desmume/src/windows/inputdx.h      | 2 +-
 desmume/src/windows/lightView.h    | 2 +-
 desmume/src/windows/mapView.h      | 2 +-
 desmume/src/windows/matrixView.h   | 2 +-
 desmume/src/windows/memView.h      | 2 +-
 desmume/src/windows/oamView.h      | 2 +-
 desmume/src/windows/ogl.cpp        | 2 +-
 desmume/src/windows/palView.h      | 2 +-
 desmume/src/windows/throttle.cpp   | 1 +
 desmume/src/windows/tileView.h     | 2 +-
 desmume/src/windows/windriver.h    | 2 +-
 20 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/desmume/src/common.h b/desmume/src/common.h
index af85aa4ac..beedea716 100644
--- a/desmume/src/common.h
+++ b/desmume/src/common.h
@@ -28,6 +28,7 @@
 #include "types.h"
 	
 #ifdef WIN32
+#define _WINSOCKAPI_
 #include <windows.h>
 
 #define CLASSNAME "DeSmuME"
diff --git a/desmume/src/windows/AboutBox.cpp b/desmume/src/windows/AboutBox.cpp
index 7eebe661f..c105d0c29 100644
--- a/desmume/src/windows/AboutBox.cpp
+++ b/desmume/src/windows/AboutBox.cpp
@@ -19,7 +19,7 @@
 */
 
 
-#include <windows.h>
+#include "../common.h"
 
 #include "AboutBox.h"
 #include "resource.h"
diff --git a/desmume/src/windows/CWindow.h b/desmume/src/windows/CWindow.h
index 088dc9f73..191b0cbe2 100644
--- a/desmume/src/windows/CWindow.h
+++ b/desmume/src/windows/CWindow.h
@@ -22,7 +22,7 @@
 #ifndef CWINDOW_H
 #define CWINDOW_H
 
-#include <windows.h>
+#include "../common.h"
 
 class WINCLASS
 {
diff --git a/desmume/src/windows/FirmConfig.cpp b/desmume/src/windows/FirmConfig.cpp
index 6b03fcd08..5055dbb66 100644
--- a/desmume/src/windows/FirmConfig.cpp
+++ b/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];
diff --git a/desmume/src/windows/IORegView.h b/desmume/src/windows/IORegView.h
index b04cae1eb..f5431ea78 100644
--- a/desmume/src/windows/IORegView.h
+++ b/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);
 
diff --git a/desmume/src/windows/colorctrl.cpp b/desmume/src/windows/colorctrl.cpp
index 226826cb5..bcf514e8c 100644
--- a/desmume/src/windows/colorctrl.cpp
+++ b/desmume/src/windows/colorctrl.cpp
@@ -1,4 +1,4 @@
-#include <windows.h>
+#include "../common.h"
 #include <stdio.h>
 #include "colorctrl.h"
 
diff --git a/desmume/src/windows/console.cpp b/desmume/src/windows/console.cpp
index 08d5c3122..3f3ae724e 100644
--- a/desmume/src/windows/console.cpp
+++ b/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>
diff --git a/desmume/src/windows/console.h b/desmume/src/windows/console.h
index 527a0ff9b..b64a2102a 100644
--- a/desmume/src/windows/console.h
+++ b/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"
 
diff --git a/desmume/src/windows/disView.h b/desmume/src/windows/disView.h
index 365c946c6..96e447b4a 100644
--- a/desmume/src/windows/disView.h
+++ b/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);
diff --git a/desmume/src/windows/inputdx.h b/desmume/src/windows/inputdx.h
index 234fc8520..84876f88c 100644
--- a/desmume/src/windows/inputdx.h
+++ b/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"
 
diff --git a/desmume/src/windows/lightView.h b/desmume/src/windows/lightView.h
index f5578bbd1..9dd1cf69a 100644
--- a/desmume/src/windows/lightView.h
+++ b/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);
  
diff --git a/desmume/src/windows/mapView.h b/desmume/src/windows/mapView.h
index 876daa3b8..ca12ed9cf 100644
--- a/desmume/src/windows/mapView.h
+++ b/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);
 
diff --git a/desmume/src/windows/matrixView.h b/desmume/src/windows/matrixView.h
index c49656543..fb3480061 100644
--- a/desmume/src/windows/matrixView.h
+++ b/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);
 
diff --git a/desmume/src/windows/memView.h b/desmume/src/windows/memView.h
index d9e13b2e2..52f7e7eda 100644
--- a/desmume/src/windows/memView.h
+++ b/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);
diff --git a/desmume/src/windows/oamView.h b/desmume/src/windows/oamView.h
index 724ada26a..ac5d3ba6a 100644
--- a/desmume/src/windows/oamView.h
+++ b/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);
diff --git a/desmume/src/windows/ogl.cpp b/desmume/src/windows/ogl.cpp
index 7892304dd..b244d117f 100644
--- a/desmume/src/windows/ogl.cpp
+++ b/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"
diff --git a/desmume/src/windows/palView.h b/desmume/src/windows/palView.h
index b32a6ed48..faef7d93c 100644
--- a/desmume/src/windows/palView.h
+++ b/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);
diff --git a/desmume/src/windows/throttle.cpp b/desmume/src/windows/throttle.cpp
index 1939debec..f9e3d89b6 100644
--- a/desmume/src/windows/throttle.cpp
+++ b/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"
diff --git a/desmume/src/windows/tileView.h b/desmume/src/windows/tileView.h
index 6c466ab1b..2a53ba6eb 100644
--- a/desmume/src/windows/tileView.h
+++ b/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);
diff --git a/desmume/src/windows/windriver.h b/desmume/src/windows/windriver.h
index 252db51e9..19052fb4e 100644
--- a/desmume/src/windows/windriver.h
+++ b/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;