diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-curl.patch --- a/mozilla-curl.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ -# HG changeset patch -# User Evan Shaw -# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4 -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 -@@ -199,17 +199,16 @@ crypt.h - cstddef - 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 -@@ -199,17 +199,16 @@ crypt.h - cstddef - 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 -@@ -28,17 +28,16 @@ - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include "common/linux/http_upload.h" - - #include - #include - #include - #include --#include - - namespace { - - // Callback to get the response data from server. - static size_t WriteCallback(void *ptr, size_t size, - size_t nmemb, void *userp) { - if (!userp) - return 0; -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 - - #include "common/linux/libcurl_wrapper.h" - - using std::string;