From 0b80855c4dd0e61c1d0f7144b5087a031f55c355 Mon Sep 17 00:00:00 2001
From: striper <striper@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Mon, 4 Jul 2011 10:03:09 +0000
Subject: [PATCH] - fix compilation with libcurl >= 7.21.7

Long time deprecated <curl/types.h> was completely removed in libcurl 7.21.7. If CST also uses newer libcurl <curl/types.h> defines can savely be removed.
Until then use "-DNEW_LIBCURL" for libcurl >= 7.21.7.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1560 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/audioplayer.cpp | 6 ++++--
 src/gui/filebrowser.cpp | 5 ++++-
 src/gui/update.cpp      | 5 ++++-
 src/system/httptool.cpp | 5 ++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index f0d780d73..c822a9608 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -143,11 +143,13 @@ void CAudiofileExt::operator=(const CAudiofileExt& src)
 //------------------------------------------------------------------------
 
 
-
 #include <curl/curl.h>
-#include <curl/types.h>
 #include <curl/easy.h>
 
+#ifndef NEW_LIBCURL
+#include <curl/types.h>
+#endif
+
 struct MemoryStruct {
 	char *memory;
 	size_t size;
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 069806884..d002cc3e5 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -57,9 +57,12 @@
 #include <sys/stat.h>
 
 #include <curl/curl.h>
-#include <curl/types.h>
 #include <curl/easy.h>
 
+#ifndef NEW_LIBCURL
+#include <curl/types.h>
+#endif
+
 #include <driver/encoding.h>
 
 #include <xmltree/xmlinterface.h>
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index e62656e1f..20d53fabc 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -56,9 +56,12 @@
 #define SQUASHFS
 
 #include <curl/curl.h>
-#include <curl/types.h>
 #include <curl/easy.h>
 
+#ifndef NEW_LIBCURL
+#include <curl/types.h>
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/system/httptool.cpp b/src/system/httptool.cpp
index 22995ec01..8be1e838b 100644
--- a/src/system/httptool.cpp
+++ b/src/system/httptool.cpp
@@ -22,9 +22,12 @@
 #include <system/httptool.h>
 
 #include <curl/curl.h>
-#include <curl/types.h>
 #include <curl/easy.h>
 
+#ifndef NEW_LIBCURL
+#include <curl/types.h>
+#endif
+
 #include <global.h>