Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla/patches/patch-gcc4

    Annotation of /trunk/mozilla/patches/patch-gcc4

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 4258 byte(s) 
    -import
    1 niro 153 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: widget/src/gtk2/nsDragService.cpp
    18     ===================================================================
    19     RCS file: /cvsroot/mozilla/widget/src/gtk2/nsDragService.cpp,v
    20     retrieving revision 1.5
    21     diff -u -r1.5 nsDragService.cpp
    22     --- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5
    23     +++ widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000
    24     @@ -838,7 +838,7 @@
    25     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    26     listTarget->target = g_strdup(gMimeListType);
    27     listTarget->flags = 0;
    28     - listTarget->info = (guint)listAtom;
    29     + listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
    30     PR_LOG(sDragLm, PR_LOG_DEBUG,
    31     ("automatically adding target %s with id %ld\n",
    32     listTarget->target, listAtom));
    33     @@ -877,7 +877,7 @@
    34     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    35     listTarget->target = g_strdup(gTextUriListType);
    36     listTarget->flags = 0;
    37     - listTarget->info = (guint)listAtom;
    38     + listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
    39     PR_LOG(sDragLm, PR_LOG_DEBUG,
    40     ("automatically adding target %s with \
    41     id %ld\n", listTarget->target, listAtom));
    42     @@ -914,7 +914,7 @@
    43     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    44     target->target = g_strdup(flavorStr);
    45     target->flags = 0;
    46     - target->info = (guint)atom;
    47     + target->info = (guint)NS_PTR_TO_INT32(atom);
    48     PR_LOG(sDragLm, PR_LOG_DEBUG,
    49     ("adding target %s with id %ld\n",
    50     target->target, atom));
    51     @@ -931,7 +931,7 @@
    52     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    53     plainTarget->target = g_strdup(kTextMime);
    54     plainTarget->flags = 0;
    55     - plainTarget->info = (guint)plainAtom;
    56     + plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
    57     PR_LOG(sDragLm, PR_LOG_DEBUG,
    58     ("automatically adding target %s with \
    59     id %ld\n", plainTarget->target, plainAtom));
    60     @@ -948,7 +948,7 @@
    61     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    62     urlTarget->target = g_strdup(gMozUrlType);
    63     urlTarget->flags = 0;
    64     - urlTarget->info = (guint)urlAtom;
    65     + urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
    66     PR_LOG(sDragLm, PR_LOG_DEBUG,
    67     ("automatically adding target %s with \
    68     id %ld\n", urlTarget->target, urlAtom));
    69     --- mailnews/mime/src/mimeeobj.h.orig Sat Dec 16 14:01:13 2006
    70     +++ mailnews/mime/src/mimeeobj.h Sat Dec 16 14:01:28 2006
    71     @@ -54,7 +54,7 @@ struct MimeExternalObjectClass {
    72     MimeLeafClass leaf;
    73     };
    74    
    75     -extern MimeExternalObjectClass mimeExternalObjectClass;
    76     +extern "C" MimeExternalObjectClass mimeExternalObjectClass;
    77    
    78     struct MimeExternalObject {
    79     MimeLeaf leaf;