[Pkg-mono-svn-commits] [mono] 06/30: Merge branch 'master-experimental-patches/kfreebsd_support' into merge/3.2.8+dfsg

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/3.2.8+dfsg-1
in repository mono.

commit f9f077cbdc52123a3828bbb475bd7111c8d6c150
Merge: b369b84 b5c7654
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Feb 19 22:56:41 2014 +0000

    Merge branch 'master-experimental-patches/kfreebsd_support' into merge/3.2.8+dfsg

 configure.in                     | 20 ++++++++++++++++++--
 libgc/configure.in               | 11 +++++++++++
 libgc/dyn_load.c                 |  4 ++--
 libgc/include/gc.h               |  2 +-
 libgc/include/private/gcconfig.h | 41 ++++++++++++++++++++++++++++++++++------
 mono/io-layer/io.c               |  2 +-
 mono/metadata/sgen-os-posix.c    |  2 +-
 mono/mini/mini-amd64.h           |  2 +-
 mono/mini/mini-x86.h             |  2 +-
 mono/utils/mono-sigcontext.h     |  8 ++++----
 10 files changed, 75 insertions(+), 19 deletions(-)

diff --cc configure.in
index 493f671,d642107..a043c1e
mode 100644,100755..100644
--- a/configure.in
+++ b/configure.in
diff --cc mono/metadata/sgen-os-posix.c
index b0270c0,b5b4b5a..738c2bc
--- a/mono/metadata/sgen-os-posix.c
+++ b/mono/metadata/sgen-os-posix.c
@@@ -34,9 -34,8 +34,9 @@@
  #include "metadata/gc-internal.h"
  #include "metadata/sgen-archdep.h"
  #include "metadata/object-internals.h"
 +#include "utils/mono-signal-handler.h"
  
- #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  const static int suspend_signal_num = SIGXFSZ;
  #else
  const static int suspend_signal_num = SIGPWR;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/mono.git