<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e4570b9722687db77f98862011f4300cc1036a3d">https://github.com/macports/macports-ports/commit/e4570b9722687db77f98862011f4300cc1036a3d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e4570b9722687db77f98862011f4300cc1036a3d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jul 5 18:18:42 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> hoard: update to 3.13, fix build
</span>---
devel/hoard/Portfile | 56 +++++++++++-----
.../files/0001-Simplify-target-for-Darwin.patch | 74 ++++++++++++++++++++++
devel/hoard/files/0002-patch-test.diff | 10 +++
devel/hoard/files/patch-malloc.h | 31 ---------
4 files changed, 125 insertions(+), 46 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hoard/Portfile b/devel/hoard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0dd2a6d4ae..1082d451cdc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/hoard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/hoard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,57 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup emeryberger Hoard cabdfad7c360c9dbb1ad76e52abd8419eea0c956
</span> name hoard
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A drop-in replacement for malloc that is very fast \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on multiprocessor machines.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://hoard.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A drop-in replacement for malloc that is very fast on multiprocessor machines
</span> long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.hoard.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${name}-[strsed ${version} {g/[.]//}]${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.cs.umass.edu/~emery/hoard/hoard-${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 69e19f4985e806c25d037c5d181a52f2d69e7c0c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-[strsed ${version} {g/[.]//}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 25653304c1cdd43ece0c4463ae33da430632feb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4e6fef8087356be036d7cc584b91a0c0fdebc1c3f92c3e05cdc93fb816bd06b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 183940
</span>
build.dir ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.cmd ${prefix}/bin/git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${build.dir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Simplify-target-for-Darwin.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-patch-test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ARCHFLAGS@|[get_canonical_archflags cxx]|g" ${build.dir}/GNUmakefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CC@|${configure.cc}|" ${build.dir}/test/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CXX@|${configure.cxx}|" ${build.dir}/test/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${build.dir}/GNUmakefile ${build.dir}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
post-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id ${prefix}/lib/libhoard.dylib ${worksrcpath}/src/libhoard.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/libhoard.dylib ${build.dir}/libhoard.dylib"
</span> }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/src/libhoard.dylib ${destroot}${prefix}/lib/libhoard.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${build.dir}/libhoard.dylib ${destroot}${prefix}/lib/libhoard.dylib
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir} "/bin/sh ./test.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hoard/files/0001-Simplify-target-for-Darwin.patch b/devel/hoard/files/0001-Simplify-target-for-Darwin.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52c9d3ed295
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/hoard/files/0001-Simplify-target-for-Darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From dcf8f7ba1c6c932b3cab208ee4b39a8f274d44e7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Jul 2023 18:56:01 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Simplify target for Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/GNUmakefile 2023-07-04 12:48:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/GNUmakefile 2023-07-05 18:05:36.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,9 +20,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: $(UNAME_S)-sunw-$(UNAME_P)-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "To use Hoard, execute this command: export LD_PRELOAD=$(DESTDIR)$(PREFIX)/libhoard.so"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(UNAME_S)-gcc-$(UNAME_P): Heap-Layers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- all: Heap-Layers $(UNAME_S)-gcc-$(UNAME_P)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install: $(UNAME_S)-gcc-$(UNAME_P)-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(UNAME_S): Heap-Layers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ all: Heap-Layers $(UNAME_S)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install: $(UNAME_S)-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(UNAME_S),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "To use Hoard, execute this command: export DYLD_INSERT_LIBRARIES=$(DESTDIR)$(PREFIX)/libhoard.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,9 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo Linux-gcc-aarch64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo Linux-gcc-x86
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo Linux-gcc-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo Darwin-gcc-i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo Darwin-gcc-arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo Darwin-gcc-powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @echo Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo SunOS-sunw-sparc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo SunOS-sunw-i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo SunOS-gcc-sparc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +65,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo generic-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo windows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.PHONY: Darwin-gcc-i386 Darwin-gcc-arm Darwin-gcc-powerpc debian freebsd netbsd Linux-gcc-x86 Linux-gcc-x86-debug SunOS-sunw-sparc SunOS-sunw-i386 SunOS-gcc-sparc generic-gcc Linux-gcc-arm Linux-gcc-aarch64 Linux-gcc-x86_64 Linux-gcc-unknown windows windows-debug clean test release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: Darwin debian freebsd netbsd Linux-gcc-x86 Linux-gcc-x86-debug SunOS-sunw-sparc SunOS-sunw-i386 SunOS-gcc-sparc generic-gcc Linux-gcc-arm Linux-gcc-aarch64 Linux-gcc-x86_64 Linux-gcc-unknown windows windows-debug clean test release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Source files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEBIAN_COMPILE = $(CXX) -g -O3 -fPIC -DNDEBUG -I. -Iinclude -Iinclude/util -Iinclude/hoard -Iinclude/superblocks -IHeap-Layers -D_REENTRANT=1 -shared source/libhoard.cpp source/unixtls.cpp Heap-Layers/wrappers/wrapper.cpp -Bsymbolic -o libhoard.so -lpthread -lstdc++ -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -ftls-model=local-dynamic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MACOS_COMPILE = $(CXX) -ftls-model=initial-exec -ftemplate-depth=1024 -arch x86_64 -arch arm64 -pipe -g $(CPPFLAGS) $(INCLUDES) -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -D'CUSTOM_PREFIX(x)=xx\#\#x' $(MACOS_SRC) -dynamiclib -install_name $(DESTDIR)$(PREFIX)/libhoard.dylib -o libhoard.dylib -ldl -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOS_COMPILE = $(CXX) -ftls-model=initial-exec -ftemplate-depth=1024 @ARCHFLAGS@ -pipe -g $(CPPFLAGS) $(INCLUDES) -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -D'CUSTOM_PREFIX(x)=xx\#\#x' $(MACOS_SRC) -dynamiclib -install_name $(DESTDIR)$(PREFIX)/libhoard.dylib -o libhoard.dylib -ldl -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOS_COMPILE_DEBUG = $(CXX) -std=c++14 -D_FORTIFY_SOURCE=2 -fstack-protector -ftrapv -fno-builtin-malloc -ftemplate-depth=1024 -arch x86_64 -arch arm64 -pipe -g -O0 -Wall $(INCLUDES) -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -D'CUSTOM_PREFIX(x)=xx\#\#x' $(MACOS_SRC) -dynamiclib -o libhoard.dylib -ldl -lpthread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,22 +175,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl /analyze /analyze:stacksize131072 $(WIN_INCLUDES) $(WIN_DEBUG_DEFINES) $(WIN_DEBUG_FLAGS) "source\libhoard.cpp" "Heap-Layers\wrappers\winwrapper.cpp" "source\wintls.cpp" /GL /link /DLL /subsystem:console /OUT:libhoard.dll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cl $(WIN_INCLUDES) $(WIN_DEBUG_DEFINES) $(WIN_DEBUG_FLAGS) /c "source\uselibhoard.cpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-i386:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Darwin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MACOS_COMPILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-i386-install: Darwin-gcc-i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp libhoard.dylib $(DESTDIR)$(PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MACOS_COMPILE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-arm-install: Darwin-gcc-arm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp libhoard.dylib $(DESTDIR)$(PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-powerpc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MACOS_COMPILE_PPC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Darwin-gcc-powerpc-install: Darwin-gcc-powerpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Darwin-install: Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp libhoard.dylib $(DESTDIR)$(PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generic-gcc:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hoard/files/0002-patch-test.diff b/devel/hoard/files/0002-patch-test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a40d13bd684
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/hoard/files/0002-patch-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/test/Makefile 2023-05-01 22:22:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/test/Makefile 2023-07-02 21:11:11.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC := $(CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX := $(CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC := @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX := @CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CCFLAGS := -g -O3 -DNDEBUG -I../common
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS := -g -O3 -DNDEBUG -I../common
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/hoard/files/patch-malloc.h b/devel/hoard/files/patch-malloc.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60149ba55ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/hoard/files/patch-malloc.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruN hoard-3.6.1.orig/src/heaplayers/wrapper.cpp hoard-3.6.1/src/heaplayers/wrapper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- hoard-3.6.1.orig/src/heaplayers/wrapper.cpp 2007-05-21 18:47:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ hoard-3.6.1/src/heaplayers/wrapper.cpp 2007-05-25 16:03:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h> // for memcpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_WIN32) || defined(linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h> // for memalign
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define WIN32_LEAN_AND_MEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ruN hoard-3.6.1.orig/src/hoarddetours.cpp hoard-3.6.1/src/hoarddetours.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- hoard-3.6.1.orig/src/hoarddetours.cpp 2007-05-21 18:47:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ hoard-3.6.1/src/hoarddetours.cpp 2007-05-25 16:04:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_WIN32) || defined(linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "detours.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(_WIN32)
</span></pre><pre style='margin:0'>
</pre>