1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
Index: gfx/src/freetype/nsFreeType.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v
retrieving revision 1.24
diff -u -r1.24 nsFreeType.cpp
--- gfx/src/freetype/nsFreeType.cpp 7 Feb 2004 15:22:30 -0000 1.24
+++ gfx/src/freetype/nsFreeType.cpp 4 Mar 2005 19:59:53 -0000
@@ -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},
Index: netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
===================================================================
RCS file: /cvsroot/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp,v
retrieving revision 1.7.20.1
diff -u -r1.7.20.1 nsHttpConnectionMgr.cpp
--- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03 -0000 1.7.20.1
+++ netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 4 Mar 2005 19:59:57 -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_INT32(param) & 0xFFFF0000) >> 16;
+ PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF;
switch (name) {
case MAX_CONNECTIONS:
Index: security/nss/lib/pki1/oiddata.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/oiddata.h,v
retrieving revision 1.1
diff -u -r1.1 oiddata.h
--- security/nss/lib/pki1/oiddata.h 4 Jan 2002 05:22:07 -0000 1.1
+++ security/nss/lib/pki1/oiddata.h 4 Mar 2005 19:59:58 -0000
@@ -43,9 +43,6 @@
#include "nsspki1t.h"
#endif /* NSSPKI1T_H */
-extern const NSSOID nss_builtin_oids[];
-extern const PRUint32 nss_builtin_oid_count;
-
/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
/*extern const PRUint32 nss_attribute_type_alias_count;*/
Index: security/nss/lib/pki1/pki1.h
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/pki1/pki1.h,v
retrieving revision 1.2
diff -u -r1.2 pki1.h
--- security/nss/lib/pki1/pki1.h 19 Jul 2001 20:40:42 -0000 1.2
+++ security/nss/lib/pki1/pki1.h 4 Mar 2005 19:59:59 -0000
@@ -58,6 +58,8 @@
/* fgmr 19990505 moved these here from oiddata.h */
extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
extern const PRUint32 nss_attribute_type_alias_count;
+extern const NSSOID nss_builtin_oids[];
+extern const PRUint32 nss_builtin_oid_count;
/*
* NSSOID
Index: widget/src/gtk2/nsDragService.cpp
===================================================================
RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
retrieving revision 1.5
diff -u -r1.5 nsDragService.cpp
--- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5
+++ widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000
@@ -838,7 +838,7 @@
(GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
listTarget->target = g_strdup(gMimeListType);
listTarget->flags = 0;
- listTarget->info = (guint)listAtom;
+ listTarget->info = (guint)(NS_PTR_TO_INT32(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 = (guint)NS_PTR_TO_INT32(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 = (guint)NS_PTR_TO_INT32(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 = (guint)NS_PTR_TO_INT32(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 = (guint)NS_PTR_TO_INT32(urlAtom);
PR_LOG(sDragLm, PR_LOG_DEBUG,
("automatically adding target %s with \
id %ld\n", urlTarget->target, urlAtom));
|
