diff options
Diffstat (limited to 'mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch')
| -rw-r--r-- | mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch new file mode 100644 index 000000000000..ab8b031069f7 --- /dev/null +++ b/mail-client/mozilla-thunderbird/files/mozilla-thunderbird-1.0.8-gcc-4.patch @@ -0,0 +1,90 @@ +diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h +--- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 ++++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 +@@ -365,8 +365,9 @@ + * Use these macros to do 64bit safe pointer conversions. + */ + +-#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) +-#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) ++#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) ++#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) ++#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) + + /* + * These macros allow you to give a hint to the compiler about branch +diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp +--- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 ++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000 +@@ -834,8 +834,8 @@ + void + nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) + { +- PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; +- PRUint16 value = PRUint32(param) & 0x0000FFFF; ++ PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16; ++ PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; + + switch (name) { + case MAX_CONNECTIONS: +diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp +--- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 ++++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 +@@ -838,7 +838,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + listTarget->target = g_strdup(gMimeListType); + listTarget->flags = 0; +- listTarget->info = (guint)listAtom; ++ listTarget->info = GPOINTER_TO_UINT(listAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with id %ld\n", + listTarget->target, listAtom)); +@@ -877,7 +877,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + listTarget->target = g_strdup(gTextUriListType); + listTarget->flags = 0; +- listTarget->info = (guint)listAtom; ++ listTarget->info = GPOINTER_TO_UINT(listAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", listTarget->target, listAtom)); +@@ -914,7 +914,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + target->target = g_strdup(flavorStr); + target->flags = 0; +- target->info = (guint)atom; ++ target->info = GPOINTER_TO_UINT(atom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("adding target %s with id %ld\n", + target->target, atom)); +@@ -931,7 +931,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + plainTarget->target = g_strdup(kTextMime); + plainTarget->flags = 0; +- plainTarget->info = (guint)plainAtom; ++ plainTarget->info = GPOINTER_TO_UINT(plainAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", plainTarget->target, plainAtom)); +@@ -948,7 +948,7 @@ + (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); + urlTarget->target = g_strdup(gMozUrlType); + urlTarget->flags = 0; +- urlTarget->info = (guint)urlAtom; ++ urlTarget->info = GPOINTER_TO_UINT(urlAtom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("automatically adding target %s with \ + id %ld\n", urlTarget->target, urlAtom)); + +diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp +--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:17:35.151589250 -0500 ++++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500 -0500 +@@ -96,7 +96,7 @@ + // Define the FreeType2 functions we resolve at run time. + // see the comment near nsFreeType2::DoneFace() for more info + // +-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f ++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f)) + FtFuncList nsFreeType2::FtFuncs [] = { + {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE}, + {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE}, |