recipes/mozilla/files/firefox-1.0-gcc4-compile.patch

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