update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / include / vki / vki-x86-l4re.h

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-l4re.h b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-l4re.h
index 1b5f4e751fddf8833d20d1b9a50312e01f1a3618..76572f0685358f5eaca710b60baef35828408660 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-l4re.h
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/vki/vki-x86-l4re.h
@@ -7,7 +7,7 @@
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
-   Copyright (C) 2000-2009 Julian Seward 
+   Copyright (C) 2000-2010 Julian Seward 
       jseward@acm.org
 
    This program is free software; you can redistribute it and/or
@@ -63,6 +63,12 @@ typedef unsigned int vki_u32;
 #define VKI_MAX_PAGE_SHIFT     VKI_PAGE_SHIFT
 #define VKI_MAX_PAGE_SIZE      VKI_PAGE_SIZE
 
+//----------------------------------------------------------------------
+// From linux-2.6.35.4/arch/x86/include/asm/shmparam.h
+//----------------------------------------------------------------------
+
+#define VKI_SHMLBA  VKI_PAGE_SIZE
+
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/asm-i386/signal.h
 //----------------------------------------------------------------------
@@ -483,11 +489,10 @@ struct vki_termios {
         ((size) << _VKI_IOC_SIZESHIFT))
 
 /* provoke compile error for invalid uses of size argument */
-#define _VKI_IOC_TYPECHECK(t) \
-       ((sizeof(t) == sizeof(t[1]) && \
-         sizeof(t) < (1 << _VKI_IOC_SIZEBITS)) \
-        ? sizeof(t) \
-        : /*cause gcc to complain about division by zero*/(1/0) )
+#define _VKI_IOC_TYPECHECK(t)                                           \
+    (VKI_STATIC_ASSERT((sizeof(t) == sizeof(t[1])                       \
+                        && sizeof(t) < (1 << _VKI_IOC_SIZEBITS)))       \
+     + sizeof(t))
 
 /* used to create numbers */
 #define _VKI_IO(type,nr)       _VKI_IOC(_VKI_IOC_NONE,(type),(nr),0)