xnu-1228.12.14.tar.gz

[apple/xnu.git] / osfmk / kern / assert.h

diff --git a/osfmk/kern/assert.h b/osfmk/kern/assert.h
index b7c9317e7270960f5ce2c1c568c635623ab1f517..1b528a4b37176a89d249e533062477c970d4af21 100644 (file)
--- a/osfmk/kern/assert.h
+++ b/osfmk/kern/assert.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -56,30 +62,34 @@
 /*     assert.h        4.2     85/01/21        */
 
 #include <kern/macro_help.h>
 /*     assert.h        4.2     85/01/21        */
 
 #include <kern/macro_help.h>

+#include <sys/cdefs.h>

 
 #ifdef MACH_KERNEL_PRIVATE
 #include <mach_assert.h>
 #endif
 
 
 #ifdef MACH_KERNEL_PRIVATE
 #include <mach_assert.h>
 #endif
 

+__BEGIN_DECLS

 /* Assert error */
 extern void    Assert(
 /* Assert error */
 extern void    Assert(

-                       const char      *file,
-                       int             line,
-                       const char      *expression);
+       const char      *file,
+       int             line,
+       const char      *expression);
+__END_DECLS

 
 #if    MACH_ASSERT
 
 
 #if    MACH_ASSERT
 

-#define assert(ex)                                                     \
-MACRO_BEGIN                                                            \
-       if (!(ex))                                                      \
-               Assert(__FILE__, __LINE__, # ex);                       \
-MACRO_END
+#define assert(ex)  \
+       ((ex) ? (void)0 : Assert(__FILE__, __LINE__, # ex))

 #define        assert_static(x)        assert(x)
 
 #define        assert_static(x)        assert(x)
 

+#define __assert_only
+

 #else  /* MACH_ASSERT */
 
 #else  /* MACH_ASSERT */
 

-#define assert(ex)             ((void)0)
-#define assert_static(ex)
+#define assert(ex) ((void)0)
+#define assert_static(ex) do {} while (0)
+
+#define __assert_only __unused

 
 #endif /* MACH_ASSERT */
 
 
 #endif /* MACH_ASSERT */