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