Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla/patches/mozilla-1.7.12-amd64-compile.patch

    Annotation of /trunk/mozilla/patches/mozilla-1.7.12-amd64-compile.patch

    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: 4020 byte(s) 
    -import
    1 niro 153 --- gfx/src/freetype/nsFreeType.cpp 7 Feb 2004 15:22:30 -0000 1.24
    2     +++ mozilla/gfx/src/freetype/nsFreeType.cpp 4 Mar 2005 19:59:53 -0000
    3     @@ -96,7 +96,7 @@
    4     // Define the FreeType2 functions we resolve at run time.
    5     // see the comment near nsFreeType2::DoneFace() for more info
    6     //
    7     -#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
    8     +#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
    9     FtFuncList nsFreeType2::FtFuncs [] = {
    10     {"FT_Done_Face", NS_FT2_OFFSET(nsFT_Done_Face), PR_TRUE},
    11     {"FT_Done_FreeType", NS_FT2_OFFSET(nsFT_Done_FreeType), PR_TRUE},
    12     --- netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 1 Sep 2004 23:31:03 -0000 1.7.20.1
    13     +++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp 4 Mar 2005 19:59:57 -0000
    14     @@ -834,8 +834,8 @@
    15     void
    16     nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
    17     {
    18     - PRUint16 name = (PRUint32(param) & 0xFFFF0000) >> 16;
    19     - PRUint16 value = PRUint32(param) & 0x0000FFFF;
    20     + PRUint16 name = (NS_PTR_TO_INT32(param) & 0xFFFF0000) >> 16;
    21     + PRUint16 value = NS_PTR_TO_INT32(param) & 0x0000FFFF;
    22    
    23     switch (name) {
    24     case MAX_CONNECTIONS:
    25     --- widget/src/gtk2/nsDragService.cpp 30 Oct 2003 01:48:41 -0000 1.5
    26     +++ mozilla/widget/src/gtk2/nsDragService.cpp 4 Mar 2005 20:00:01 -0000
    27     @@ -838,7 +838,7 @@
    28     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    29     listTarget->target = g_strdup(gMimeListType);
    30     listTarget->flags = 0;
    31     - listTarget->info = (guint)listAtom;
    32     + listTarget->info = (guint)(NS_PTR_TO_INT32(listAtom));
    33     PR_LOG(sDragLm, PR_LOG_DEBUG,
    34     ("automatically adding target %s with id %ld\n",
    35     listTarget->target, listAtom));
    36     @@ -877,7 +877,7 @@
    37     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    38     listTarget->target = g_strdup(gTextUriListType);
    39     listTarget->flags = 0;
    40     - listTarget->info = (guint)listAtom;
    41     + listTarget->info = (guint)NS_PTR_TO_INT32(listAtom);
    42     PR_LOG(sDragLm, PR_LOG_DEBUG,
    43     ("automatically adding target %s with \
    44     id %ld\n", listTarget->target, listAtom));
    45     @@ -914,7 +914,7 @@
    46     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    47     target->target = g_strdup(flavorStr);
    48     target->flags = 0;
    49     - target->info = (guint)atom;
    50     + target->info = (guint)NS_PTR_TO_INT32(atom);
    51     PR_LOG(sDragLm, PR_LOG_DEBUG,
    52     ("adding target %s with id %ld\n",
    53     target->target, atom));
    54     @@ -931,7 +931,7 @@
    55     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    56     plainTarget->target = g_strdup(kTextMime);
    57     plainTarget->flags = 0;
    58     - plainTarget->info = (guint)plainAtom;
    59     + plainTarget->info = (guint)NS_PTR_TO_INT32(plainAtom);
    60     PR_LOG(sDragLm, PR_LOG_DEBUG,
    61     ("automatically adding target %s with \
    62     id %ld\n", plainTarget->target, plainAtom));
    63     @@ -948,7 +948,7 @@
    64     (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
    65     urlTarget->target = g_strdup(gMozUrlType);
    66     urlTarget->flags = 0;
    67     - urlTarget->info = (guint)urlAtom;
    68     + urlTarget->info = (guint)NS_PTR_TO_INT32(urlAtom);
    69     PR_LOG(sDragLm, PR_LOG_DEBUG,
    70     ("automatically adding target %s with \
    71     id %ld\n", urlTarget->target, urlAtom));