Fixes for new curl versions.

Looks like type.h is removed from curl distribution rendering xmlrpc-c code uncompileable. All code is wrapped
around HAVE_CURLTYPES_H. Also if _REENTRANT was defined, gcc will report warning as it is defined by default (:S).
This commit is contained in:
Sanel Zukan 2012-05-16 07:55:41 +00:00
parent 1addbd0c3c
commit 037460d4b3
4 changed files with 18 additions and 4 deletions

View File

@ -17,7 +17,11 @@
#endif #endif
#include <curl/curl.h> #include <curl/curl.h>
#ifdef HAVE_CURLTYPES_H
# include <curl/types.h> # include <curl/types.h>
#endif
#include <curl/easy.h> #include <curl/easy.h>
#include <curl/multi.h> #include <curl/multi.h>

View File

@ -15,7 +15,11 @@
#include "version.h" #include "version.h"
#include <curl/curl.h> #include <curl/curl.h>
#ifdef HAVE_CURLTYPES_H
# include <curl/types.h> # include <curl/types.h>
#endif
#include <curl/easy.h> #include <curl/easy.h>
#include "curlversion.h" #include "curlversion.h"

View File

@ -83,7 +83,11 @@
#include "xmlrpc-c/time_int.h" #include "xmlrpc-c/time_int.h"
#include <curl/curl.h> #include <curl/curl.h>
#ifdef HAVE_CURLTYPES_H
# include <curl/types.h> # include <curl/types.h>
#endif
#include <curl/easy.h> #include <curl/easy.h>
#include <curl/multi.h> #include <curl/multi.h>

View File

@ -27,7 +27,9 @@
#define PTHREADX_H_INCLUDED #define PTHREADX_H_INCLUDED
#ifndef WIN32 #ifndef WIN32
# ifndef _REENTRANT /* gcc warns since is already defined by default */
# define _REENTRANT # define _REENTRANT
# endif
# include <pthread.h> # include <pthread.h>
#elif defined (WIN32) #elif defined (WIN32)
#include <windows.h> #include <windows.h>