Annotation of /trunk/nvu/patches/nvu-1.0-gcc4-x86_64.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5043 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 5043 byte(s)
-import
1 | niro | 153 | diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h |
2 | --- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000 | ||
3 | +++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000 | ||
4 | @@ -365,8 +365,9 @@ | ||
5 | * Use these macros to do 64bit safe pointer conversions. | ||
6 | */ | ||
7 | |||
8 | -#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0) | ||
9 | -#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x))) | ||
10 | +#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x)) | ||
11 | +#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x)) | ||
12 | +#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x)) | ||
13 | |||
14 | /* | ||
15 | * These macros allow you to give a hint to the compiler about branch | ||
16 | diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp | ||
17 | --- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000 | ||
18 | +++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000 | ||
19 | @@ -834,8 +834,8 @@ | ||
20 | void | ||
21 | nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param) | ||
22 | { | ||
23 | - PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16; | ||
24 | - PRUint16 value = PRUint32(param) & 0x0000FFFF; | ||
25 | + PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16; | ||
26 | + PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF; | ||
27 | |||
28 | switch (name) { | ||
29 | case MAX_CONNECTIONS: | ||
30 | diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp | ||
31 | --- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000 | ||
32 | +++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000 | ||
33 | @@ -838,7 +838,7 @@ | ||
34 | (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); | ||
35 | listTarget->target = g_strdup(gMimeListType); | ||
36 | listTarget->flags = 0; | ||
37 | - listTarget->info = (guint)listAtom; | ||
38 | + listTarget->info = GPOINTER_TO_UINT(listAtom); | ||
39 | PR_LOG(sDragLm, PR_LOG_DEBUG, | ||
40 | ("automatically adding target %s with id %ld\n", | ||
41 | listTarget->target, listAtom)); | ||
42 | @@ -877,7 +877,7 @@ | ||
43 | (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); | ||
44 | listTarget->target = g_strdup(gTextUriListType); | ||
45 | listTarget->flags = 0; | ||
46 | - listTarget->info = (guint)listAtom; | ||
47 | + listTarget->info = GPOINTER_TO_UINT(listAtom); | ||
48 | PR_LOG(sDragLm, PR_LOG_DEBUG, | ||
49 | ("automatically adding target %s with \ | ||
50 | id %ld\n", listTarget->target, listAtom)); | ||
51 | @@ -914,7 +930,7 @@ | ||
52 | (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); | ||
53 | target->target = g_strdup(flavorStr); | ||
54 | target->flags = 0; | ||
55 | - target->info = (guint)atom; | ||
56 | + target->info = GPOINTER_TO_UINT(atom); | ||
57 | PR_LOG(sDragLm, PR_LOG_DEBUG, | ||
58 | ("adding target %s with id %ld\n", | ||
59 | target->target, atom)); | ||
60 | @@ -931,7 +947,7 @@ | ||
61 | (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); | ||
62 | plainTarget->target = g_strdup(kTextMime); | ||
63 | plainTarget->flags = 0; | ||
64 | - plainTarget->info = (guint)plainAtom; | ||
65 | + plainTarget->info = GPOINTER_TO_UINT(plainAtom); | ||
66 | PR_LOG(sDragLm, PR_LOG_DEBUG, | ||
67 | ("automatically adding target %s with \ | ||
68 | id %ld\n", plainTarget->target, plainAtom)); | ||
69 | @@ -948,7 +964,7 @@ | ||
70 | (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry)); | ||
71 | urlTarget->target = g_strdup(gMozUrlType); | ||
72 | urlTarget->flags = 0; | ||
73 | - urlTarget->info = (guint)urlAtom; | ||
74 | + urlTarget->info = GPOINTER_TO_UINT(urlAtom); | ||
75 | PR_LOG(sDragLm, PR_LOG_DEBUG, | ||
76 | ("automatically adding target %s with \ | ||
77 | id %ld\n", urlTarget->target, urlAtom)); | ||
78 | diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp | ||
79 | --- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:17:35.151589250 -0500 | ||
80 | +++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500 -0500 | ||
81 | @@ -96,7 +96,7 @@ | ||
82 | // Define the FreeType2 functions we resolve at run time. | ||
83 | // see the comment near nsFreeType2::DoneFace() for more info | ||
84 | // | ||
85 | -#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f | ||
86 | +#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f)) | ||
87 | FtFuncList nsFreeType2::FtFuncs [] = { | ||
88 | {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE}, | ||
89 | {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE}, | ||
90 |