|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 138-142
Link Here
|
| 138 |
[selftest=false]) |
138 |
[selftest=false]) |
| 139 |
AM_CONDITIONAL(SELFTEST, test x$selftest = xtrue) |
139 |
AM_CONDITIONAL(SELFTEST, test x$selftest = xtrue) |
| 140 |
|
140 |
|
|
|
141 |
AC_CHECK_HEADERS([curl/curl.h], [CURL_HEADER=yes; break;]) |
| 142 |
|
| 141 |
AC_CONFIG_FILES([Makefile]) |
143 |
AC_CONFIG_FILES([Makefile]) |
| 142 |
AC_OUTPUT |
144 |
AC_OUTPUT |
| 143 |
-- src/common/linux/http_upload.cc |
145 |
++ src/common/linux/http_upload.cc |
|
Lines 31-37
Link Here
|
| 31 |
|
31 |
|
| 32 |
#include <assert.h> |
32 |
#include <assert.h> |
| 33 |
#include <dlfcn.h> |
33 |
#include <dlfcn.h> |
|
|
34 |
|
| 35 |
#include "config.h" |
| 36 |
|
| 37 |
#ifdef HAVE_CURL_CURL_H |
| 38 |
#include <curl/curl.h> |
| 39 |
#else |
| 34 |
#include "third_party/curl/curl.h" |
40 |
#include "third_party/curl/curl.h" |
|
|
41 |
#endif |
| 35 |
|
42 |
|
| 36 |
namespace { |
43 |
namespace { |
| 37 |
|
44 |
|
| 38 |
-- src/common/linux/libcurl_wrapper.h |
45 |
++ src/common/linux/libcurl_wrapper.h |
|
Lines 34-40
Link Here
|
| 34 |
#include <map> |
34 |
#include <map> |
| 35 |
|
35 |
|
| 36 |
#include "common/using_std_string.h" |
36 |
#include "common/using_std_string.h" |
|
|
37 |
|
| 38 |
#include "config.h" |
| 39 |
|
| 40 |
#ifdef HAVE_CURL_CURL_H |
| 41 |
#include <curl/curl.h> |
| 42 |
#else |
| 37 |
#include "third_party/curl/curl.h" |
43 |
#include "third_party/curl/curl.h" |
|
|
44 |
#endif |
| 38 |
|
45 |
|
| 39 |
namespace google_breakpad { |
46 |
namespace google_breakpad { |
| 40 |
class LibcurlWrapper { |
47 |
class LibcurlWrapper { |
