head	1.2;
access;
symbols
	pkgsrc-2014Q2:1.1.0.2
	pkgsrc-2014Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.07.29.07.03.27;	author adam;	state dead;
branches;
next	1.1;
commitid	AhB1pIUYhFmK2fKx;

1.1
date	2014.04.17.06.20.27;	author wiz;	state Exp;
branches;
next	;
commitid	StE3EfVzMD7g70xx;


desc
@@


1.2
log
@Changes 0.48.5:
Adobe Illustrator SVG files containing entities can be loaded again
Support for Poppler 0.26
Support for Boehm-GC 7.4.0 and later
Several crash bugs were fixed
64-bit compilation is now possible on Windows
@
text
@$NetBSD: patch-src_gc.cpp,v 1.1 2014/04/17 06:20:27 wiz Exp $

    Committer: Johan B. C. Engelen
    Date: 2014-01-12 21:00:46 UTC
    Revision ID: j.b.c.engelen@@alumnus.utwente.nl-20140112210046-w4k02e3v5wkwg2za

https://launchpad.net/bugs/1265072
fix build with boehm-gc 7.4.0+ (patch by Vladimir Smirnov, slightly modified by me)


--- src/gc.cpp.orig	2012-02-14 03:22:17.000000000 +0000
+++ src/gc.cpp
@@@@ -70,9 +70,13 @@@@ void *debug_base(void *ptr) {
     return base + debug_base_fixup();
 }
 
-int debug_general_register_disappearing_link(void **p_ptr, void *base) {
-    char *real_base=reinterpret_cast<char *>(base) - debug_base_fixup();
+int debug_general_register_disappearing_link(void **p_ptr, void const *base) {
+    char const *real_base = reinterpret_cast<char const *>(base) - debug_base_fixup();
+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
     return GC_general_register_disappearing_link(p_ptr, real_base);
+#else // compatibility with older Boehm GC versions
+    return GC_general_register_disappearing_link(p_ptr, const_cast<char *>(real_base));
+#endif
 }
 
 void dummy_do_init() {}
@@@@ -90,7 +94,7 @@@@ void dummy_register_finalizer(void *, Cl
     }
 }
 
-int dummy_general_register_disappearing_link(void **, void *) { return false; }
+int dummy_general_register_disappearing_link(void **, void const *) { return false; }
 
 int dummy_unregister_disappearing_link(void **/*link*/) { return false; }
 
@@@@ -112,7 +116,11 @@@@ Ops enabled_ops = {
     &GC_malloc_atomic_uncollectable,
     &GC_base,
     &GC_register_finalizer_ignore_self,
-    &GC_general_register_disappearing_link,
+#if (GC_MAJOR_VERSION >= 7 && GC_MINOR_VERSION >= 4)
+     &GC_general_register_disappearing_link,
+#else // compatibility with older Boehm GC versions
+    (int (*)(void**, const void*))(&GC_general_register_disappearing_link),
+#endif
     &GC_unregister_disappearing_link,
     &GC_get_heap_size,
     &GC_get_free_bytes,
@@@@ -202,7 +210,7 @@@@ void stub_register_finalizer_ignore_self
     die_because_not_initialized();
 }
 
-int stub_general_register_disappearing_link(void **, void *) {
+int stub_general_register_disappearing_link(void **, void const *) {
     die_because_not_initialized();
     return 0;
 }
@


1.1
log
@Fix build with boehm-gc-7.4. From upstream bzr.
Depend on that version of boehm-gc and bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@