components/w3m/patches/04-get_warn_proc.patch
author pkidd <patrick.kidd@oracle.com>
Thu, 10 Mar 2016 08:38:19 -0800
branchs11u3-sru
changeset 5573 56564f280aba
parent 3830 d9fd82448491
permissions -rw-r--r--
Added tag 0.175.3.7.0.1.0, S11.3SRU7.1 for changeset 9eae79cfd382
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3830
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
# Copied over from the desktop consolidation, which has the comment:
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
# date:2012-08-09 owner:davelam type bug bugster:555467
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
# Unfortunately there is no such bug in BugDB
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
#
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
# This patch needs to be evaluated to see if it needs to be passed upstream.
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
--- w3m-0.5.2/main.c.ori	2012-08-09 10:33:36.510910856 +0800
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
+++ w3m-0.5.2/main.c	2012-08-09 10:34:03.817856620 +0800
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
@@ -842,7 +842,9 @@
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
     mySignal(SIGPIPE, SigPipe);
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
 #endif
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
 
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
+    orig_GC_warn_proc = GC_get_warn_proc();
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
+    GC_set_warn_proc(wrap_GC_warn_proc);
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
+
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
     err_msg = Strnew();
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
     if (load_argc == 0) {
d9fd82448491 20146056 Move w3m from the Desktop consolidation to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 	/* no URL specified */