| blob | ff58d9b92ecb3d90bc7b1849062c603489af7995 |
1 diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
2 --- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500
3 +++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500
4 @@ -43,12 +43,6 @@
5 #include "nsspki1t.h"
6 #endif /* NSSPKI1T_H */
8 -extern const NSSOID nss_builtin_oids[];
9 -extern const PRUint32 nss_builtin_oid_count;
10 -
11 -/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
12 -/*extern const PRUint32 nss_attribute_type_alias_count;*/
13 -
14 extern const NSSOID *NSS_OID_RFC1274_UID;
15 extern const NSSOID *NSS_OID_RFC1274_EMAIL;
16 extern const NSSOID *NSS_OID_RFC2247_DC;
17 diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
18 --- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500
19 +++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500
20 @@ -233,12 +233,6 @@
21 #include "nsspki1t.h"
22 #endif /* NSSPKI1T_H */
24 -extern const NSSOID nss_builtin_oids[];
25 -extern const PRUint32 nss_builtin_oid_count;
26 -
27 -/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
28 -/*extern const PRUint32 nss_attribute_type_alias_count;*/
29 -
30 EOD
31 ;
33 diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
34 --- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500
35 +++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500
36 @@ -55,7 +55,9 @@
38 PR_BEGIN_EXTERN_C
40 -/* fgmr 19990505 moved these here from oiddata.h */
41 +extern const NSSOID nss_builtin_oids[];
42 +extern const PRUint32 nss_builtin_oid_count;
43 +
44 extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
45 extern const PRUint32 nss_attribute_type_alias_count;
47 diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h
48 --- mozilla-orig/xpcom/base/nscore.h 2005-07-24 05:07:54.627311840 +0000
49 +++ mozilla/xpcom/base/nscore.h 2005-07-24 05:13:02.327534296 +0000
50 @@ -365,8 +365,9 @@
51 * Use these macros to do 64bit safe pointer conversions.
52 */
54 -#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
55 -#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
56 +#define NS_PTR_TO_INT32(x) ((PRInt32) (PRWord) (x))
57 +#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
58 +#define NS_INT32_TO_PTR(x) ((void *) (PRWord) (x))
60 /*
61 * These macros allow you to give a hint to the compiler about branch
62 diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
63 --- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:07:51.199832896 +0000
64 +++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 2005-07-24 05:13:08.302625944 +0000
65 @@ -834,8 +834,8 @@
66 void
67 nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
68 {
69 - PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
70 - PRUint16 value = PRUint32(param) & 0x0000FFFF;
71 + PRUint16 name = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16;
72 + PRUint16 value = NS_PTR_TO_UINT32(param) & 0x0000FFFF;
74 switch (name) {
75 case MAX_CONNECTIONS:
76 diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp
77 --- mozilla-orig/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:08:57.666728392 +0000
78 +++ mozilla/widget/src/gtk2/nsDragService.cpp 2005-07-24 05:13:33.910732920 +0000
79 @@ -838,7 +838,7 @@
80 (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
81 listTarget->target = g_strdup(gMimeListType);
82 listTarget->flags = 0;
83 - listTarget->info = (guint)listAtom;
84 + listTarget->info = GPOINTER_TO_UINT(listAtom);
85 PR_LOG(sDragLm, PR_LOG_DEBUG,
86 ("automatically adding target %s with id %ld\n",
87 listTarget->target, listAtom));
88 @@ -877,7 +877,7 @@
89 (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
90 listTarget->target = g_strdup(gTextUriListType);
91 listTarget->flags = 0;
92 - listTarget->info = (guint)listAtom;
93 + listTarget->info = GPOINTER_TO_UINT(listAtom);
94 PR_LOG(sDragLm, PR_LOG_DEBUG,
95 ("automatically adding target %s with \
96 id %ld\n", listTarget->target, listAtom));
97 @@ -914,7 +930,7 @@
98 (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
99 target->target = g_strdup(flavorStr);
100 target->flags = 0;
101 - target->info = (guint)atom;
102 + target->info = GPOINTER_TO_UINT(atom);
103 PR_LOG(sDragLm, PR_LOG_DEBUG,
104 ("adding target %s with id %ld\n",
105 target->target, atom));
106 @@ -931,7 +947,7 @@
107 (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
108 plainTarget->target = g_strdup(kTextMime);
109 plainTarget->flags = 0;
110 - plainTarget->info = (guint)plainAtom;
111 + plainTarget->info = GPOINTER_TO_UINT(plainAtom);
112 PR_LOG(sDragLm, PR_LOG_DEBUG,
113 ("automatically adding target %s with \
114 id %ld\n", plainTarget->target, plainAtom));
115 @@ -948,7 +964,7 @@
116 (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
117 urlTarget->target = g_strdup(gMozUrlType);
118 urlTarget->flags = 0;
119 - urlTarget->info = (guint)urlAtom;
120 + urlTarget->info = GPOINTER_TO_UINT(urlAtom);
121 PR_LOG(sDragLm, PR_LOG_DEBUG,
122 ("automatically adding target %s with \
123 id %ld\n", urlTarget->target, urlAtom));
124 diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp
125 --- mozilla-orig/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:17:35.151589250 -0500
126 +++ mozilla/gfx/src/freetype/nsFreeType.cpp 2005-10-22 13:23:07.672370500 -0500
127 @@ -96,7 +96,7 @@
128 // Define the FreeType2 functions we resolve at run time.
129 // see the comment near nsFreeType2::DoneFace() for more info
130 //
131 -#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
132 +#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
133 FtFuncList nsFreeType2::FtFuncs [] = {
134 {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE},
135 {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE},