Merge pull request #921 from EQEmu/master_build_revert

Build merge into master again

common/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(common_sources
 	base_packet.cpp

common/useperl.h

@@ -13,6 +13,10 @@
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
+#if _MSC_VER
+#define __inline__ __inline
+#define __builtin_expect 
+#endif
 #include <perl.h>
 #include <XSUB.h>
 #ifndef WIN32