From 01a668d3619005f673f09f7ab45bc090c16d70b1 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Thu, 2 Apr 2009 14:11:48 +0200
Subject: [PATCH] Upstream tarball 9548

---
 .svn-revision      |  2 +-
 docs/Changelog     |  1 +
 src/IP2Country.cpp | 13 +++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 6ea05ed5..7b871029 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9546
+9548
diff --git a/docs/Changelog b/docs/Changelog
index 9deadafb..46d021f9 100644
--- a/docs/Changelog
+++ b/docs/Changelog
@@ -131,6 +131,7 @@ Version 2.2.4 - The "don't know yet if there will be another 2.2" version.
 	iz0bbz:
 		* Fixed static linking with GeoIP on MinGW/MSYS.
 		* Fixed detecting GeoIP library when building for MinGW.
+		* Compilation fix for GeoIP-1.4.6.
 
 	Stu Redman:
 		* Fix crash on global search on Windows
diff --git a/src/IP2Country.cpp b/src/IP2Country.cpp
index 8fa61854..fd18e2bc 100644
--- a/src/IP2Country.cpp
+++ b/src/IP2Country.cpp
@@ -40,13 +40,15 @@
 // Contact: mjames@gmail.com
 //
 
-#include <GeoIP.h>
-
-#include "IP2Country.h"
-
 // MSVC projects can't include files configuration dependent, so just double-check the #define
 #ifdef ENABLE_IP2COUNTRY
 
+#ifdef _MSC_VER
+// MSVC needs it here, MingW needs it below
+#include <GeoIP.h>
+#include "IP2Country.h"
+#endif
+
 #include "amule.h"			// For theApp
 #include "Preferences.h"	// For thePrefs
 #include "CFile.h"			// For CPath
@@ -60,6 +62,9 @@
 #include <wx/intl.h>
 #include <wx/image.h>
 
+#include <GeoIP.h>
+#include "IP2Country.h"
+
 CIP2Country::CIP2Country()
 {
 	m_geoip = NULL;
-- 
2.11.4.GIT