Skip to content

Commit 037460d

Browse files
committed
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).
1 parent 1addbd0 commit 037460d

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curlmulti.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
#endif
1818

1919
#include <curl/curl.h>
20-
#include <curl/types.h>
20+
21+
#ifdef HAVE_CURLTYPES_H
22+
# include <curl/types.h>
23+
#endif
24+
2125
#include <curl/easy.h>
2226
#include <curl/multi.h>
2327

ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/curltransaction.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
#include "version.h"
1616

1717
#include <curl/curl.h>
18-
#include <curl/types.h>
18+
19+
#ifdef HAVE_CURLTYPES_H
20+
# include <curl/types.h>
21+
#endif
22+
1923
#include <curl/easy.h>
2024

2125
#include "curlversion.h"

ede-bug-tools/ede-bug-report/xmlrpc-c/deps/curl-transport/xmlrpc_curl_transport.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,11 @@
8383
#include "xmlrpc-c/time_int.h"
8484

8585
#include <curl/curl.h>
86-
#include <curl/types.h>
86+
87+
#ifdef HAVE_CURLTYPES_H
88+
# include <curl/types.h>
89+
#endif
90+
8791
#include <curl/easy.h>
8892
#include <curl/multi.h>
8993

ede-bug-tools/ede-bug-report/xmlrpc-c/deps/util/include/pthreadx.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
#define PTHREADX_H_INCLUDED
2828

2929
#ifndef WIN32
30+
# ifndef _REENTRANT /* gcc warns since is already defined by default */
3031
# define _REENTRANT
31-
# include <pthread.h>
32+
# endif
33+
# include <pthread.h>
3234
#elif defined (WIN32)
3335
#include <windows.h>
3436

0 commit comments

Comments
 (0)