diff -r 436c76ab5f25 -r 9a09a02dff60 mozilla-curl.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-curl.patch Fri Aug 12 08:47:59 2011 +0200 @@ -0,0 +1,89 @@ +# HG changeset patch +# User Evan Shaw +# Parent 2d4a2ce9f921163094c9a29c776b2a6e986febe2 +bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -198,17 +198,16 @@ crt_externs.h + crypt.h + cstdio + cstdlib + cstring + ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h + dbus/dbus.h + dbus/dbus-glib.h + dbus/dbus-glib-lowlevel.h + ddeml.h + Debug.h +diff --git a/js/src/config/system-headers b/js/src/config/system-headers +--- a/js/src/config/system-headers ++++ b/js/src/config/system-headers +@@ -198,17 +198,16 @@ crt_externs.h + crypt.h + cstdio + cstdlib + cstring + ctime + ctype.h + curl/curl.h + curl/easy.h +-curl/types.h + curses.h + cxxabi.h + DateTimeUtils.h + dbus/dbus.h + dbus/dbus-glib.h + dbus/dbus-glib-lowlevel.h + ddeml.h + Debug.h +diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc +@@ -26,17 +26,16 @@ + // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include + #include + #include + #include +-#include + + #include "common/linux/http_upload.h" + + namespace { + + // Callback to get the response data from server. + static size_t WriteCallback(void *ptr, size_t size, + size_t nmemb, void *userp) { +diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc ++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc +@@ -24,17 +24,16 @@ + // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include + #include +-#include + #include + + #include + + #include "common/linux/libcurl_wrapper.h" + #include "third_party/linux/include/glog/logging.h" + + namespace google_breakpad {