[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.7-5-49-g39e5b9e

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 39e5b9e4b05180bcaeaf11dcffb6b1e174c7b37e
Merge: 1ced0ac96a3b1844817681a7153a374ad212e34c 5256c49fcf86052cdca7fee0d4c1900ff6f7b515
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Jan 30 15:04:19 2011 +0100

    Merge branch 'upstream-2.10_rc1/debian/patches/kfreebsd_support' into master-experimental

diff --combined mono/utils/mono-sigcontext.h
index e5b443a,16bf24c..62e82a9
--- a/mono/utils/mono-sigcontext.h
+++ b/mono/utils/mono-sigcontext.h
@@@ -8,14 -8,14 +8,14 @@@
  
  #if defined(__i386__)
  
 -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
 +#if defined(__FreeBSD__) || defined(__APPLE__)
  #include <ucontext.h>
  #endif
  #if defined(__APPLE__)
  #include <AvailabilityMacros.h>
  #endif
  
 -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 +#if defined(__FreeBSD__)
  	#define UCONTEXT_REG_EAX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_eax)
  	#define UCONTEXT_REG_EBX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ebx)
  	#define UCONTEXT_REG_ECX(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_ecx)
@@@ -99,7 -99,7 +99,7 @@@
  	#define UCONTEXT_REG_R13(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r13)
  	#define UCONTEXT_REG_R14(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r14)
  	#define UCONTEXT_REG_R15(ctx) (((ucontext_t*)(ctx))->uc_mcontext->__ss.__r15)
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  #define UCONTEXT_GREGS(ctx)	((guint64*)&(((ucontext_t*)(ctx))->uc_mcontext))
  #elif defined(__OpenBSD__)
      /* OpenBSD/amd64 has no gregs array, ucontext_t == sigcontext */

-- 
mono