|
1 # HG changeset patch |
|
2 # User Evan Shaw <edsrzf@gmail.com> |
|
3 # Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4 |
|
4 bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted |
|
5 |
|
6 diff --git a/config/system-headers b/config/system-headers |
|
7 --- a/config/system-headers |
|
8 +++ b/config/system-headers |
|
9 @@ -199,17 +199,16 @@ crypt.h |
|
10 cstddef |
|
11 cstdio |
|
12 cstdlib |
|
13 cstring |
|
14 ctime |
|
15 ctype.h |
|
16 curl/curl.h |
|
17 curl/easy.h |
|
18 -curl/types.h |
|
19 curses.h |
|
20 cxxabi.h |
|
21 DateTimeUtils.h |
|
22 dbus/dbus.h |
|
23 dbus/dbus-glib.h |
|
24 dbus/dbus-glib-lowlevel.h |
|
25 ddeml.h |
|
26 Debug.h |
|
27 diff --git a/js/src/config/system-headers b/js/src/config/system-headers |
|
28 --- a/js/src/config/system-headers |
|
29 +++ b/js/src/config/system-headers |
|
30 @@ -199,17 +199,16 @@ crypt.h |
|
31 cstddef |
|
32 cstdio |
|
33 cstdlib |
|
34 cstring |
|
35 ctime |
|
36 ctype.h |
|
37 curl/curl.h |
|
38 curl/easy.h |
|
39 -curl/types.h |
|
40 curses.h |
|
41 cxxabi.h |
|
42 DateTimeUtils.h |
|
43 dbus/dbus.h |
|
44 dbus/dbus-glib.h |
|
45 dbus/dbus-glib-lowlevel.h |
|
46 ddeml.h |
|
47 Debug.h |
|
48 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc |
|
49 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc |
|
50 +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc |
|
51 @@ -28,17 +28,16 @@ |
|
52 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
53 |
|
54 #include "common/linux/http_upload.h" |
|
55 |
|
56 #include <assert.h> |
|
57 #include <dlfcn.h> |
|
58 #include <curl/curl.h> |
|
59 #include <curl/easy.h> |
|
60 -#include <curl/types.h> |
|
61 |
|
62 namespace { |
|
63 |
|
64 // Callback to get the response data from server. |
|
65 static size_t WriteCallback(void *ptr, size_t size, |
|
66 size_t nmemb, void *userp) { |
|
67 if (!userp) |
|
68 return 0; |
|
69 diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc |
|
70 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc |
|
71 +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc |
|
72 @@ -24,17 +24,16 @@ |
|
73 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
|
74 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
|
75 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
76 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
|
77 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
78 |
|
79 #include <curl/curl.h> |
|
80 #include <curl/easy.h> |
|
81 -#include <curl/types.h> |
|
82 #include <dlfcn.h> |
|
83 |
|
84 #include <iostream> |
|
85 #include <string> |
|
86 |
|
87 #include "common/linux/libcurl_wrapper.h" |
|
88 |
|
89 using std::string; |