Merge pull request #4066 from Martchus/master

Fix typedef for CURL
2016-08-01 00:35:42 +02:00 · 2016-08-01 00:35:42 +02:00 · 04bf2d612c
parent 18a669abcc 0157b72bbc
commit 04bf2d612c
1 changed files with 5 additions and 0 deletions
--- a/Source/Core/Common/Analytics.h
+++ b/Source/Core/Common/Analytics.h
@ -10,13 +10,18 @@
 #include <thread>
 #include <utility>
 #include <vector>
+#include <curl/curlver.h>

 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/FifoQueue.h"
 #include "Common/Flag.h"

+#if LIBCURL_VERSION_MAJOR >= 7 && LIBCURL_VERSION_MINOR >= 50
+typedef struct Curl_easy CURL;
+#else
 typedef void CURL;
+#endif

 // Utilities for analytics reporting in Dolphin. This reporting is designed to
 // provide anonymous data about how well Dolphin performs in the wild. It also