From 73026ea9739e791ce1c4f1386219c13ced091c0a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 28 Jun 2011 07:25:43 +0000 Subject: [PATCH] Merged from svn/trunk changeset 12675, "Added #if lib curl version check around #include as this header was deprecated and now removed entirely from libcurl-7.21.7." --- src/osgPlugins/curl/ReaderWriterCURL.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp index d9e81a958..1cfd799ac 100644 --- a/src/osgPlugins/curl/ReaderWriterCURL.cpp +++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp @@ -21,7 +21,14 @@ #include #include -#include + +#if LIBCURL_VERSION_NUM < 0x071503 + // types.h has been removed in 7.21.7 so have to protect with version guard + // it may be possible to remove it completely but can't yet work out when + // types.h was deprecated so will assume it's still needed in older libcurl versions + // that OSG users are using. + #include +#endif #include "ReaderWriterCURL.h"