From 66c895dca4a17375f37c605983e0d4495607cf92 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Mon, 27 Jul 2009 18:01:42 +0000
Subject: [PATCH] fixi wifi compiling in linux

---
 desmume/src/wifi.cpp | 3 ++-
 desmume/src/wifi.h   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/desmume/src/wifi.cpp b/desmume/src/wifi.cpp
index bb2c415b3..c671a9afa 100644
--- a/desmume/src/wifi.cpp
+++ b/desmume/src/wifi.cpp
@@ -32,12 +32,13 @@
 #include "pcap/pcap.h"
 #endif
 
-wifimac_t wifiMac;
 bool wifi_netEnabled = false;
 pcap_t *wifi_bridge = NULL;
 
 #endif
 
+wifimac_t wifiMac;
+
 /*******************************************************************************
 
 	Firmware info needed for wifi, if no firmware image is available
diff --git a/desmume/src/wifi.h b/desmume/src/wifi.h
index 11a2b740b..d823eb384 100644
--- a/desmume/src/wifi.h
+++ b/desmume/src/wifi.h
@@ -30,6 +30,7 @@
 #define PACKET_SIZE 65535
 #define _INC_STDIO
 
+#endif
 
 #define		REG_WIFI_ID					0x000
 #define     REG_WIFI_MODE       		0x004
@@ -476,11 +477,12 @@ typedef struct
 
 } wifimac_t ;
 
-
 // desmume host communication
+#ifdef EXPERIMENTAL_WIFI
 typedef struct pcap pcap_t;
-extern bool wifi_netEnabled;
 extern pcap_t *wifi_bridge;
+#endif
+extern bool wifi_netEnabled;
 
 extern wifimac_t wifiMac;
 
@@ -521,8 +523,6 @@ void WIFI_SoftAP_Shutdown(wifimac_t *wifi);
 void WIFI_SoftAP_RecvPacketFromDS(wifimac_t *wifi, u8 *packet, int len);
 void WIFI_SoftAP_usTrigger(wifimac_t *wifi);
 
-#endif
-
 /* DS WFC profile data documented here : */
 /* http://dsdev.bigredpimp.com/2006/07/31/aoss-wfc-profile-data/ */
 /* Note : we use bytes to avoid endianness issues */