diff options
Diffstat (limited to 'ace/os_include/assert.h')
| -rw-r--r-- | ace/os_include/assert.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/ace/os_include/assert.h b/ace/os_include/assert.h index 58864cf9961..e3545016410 100644 --- a/ace/os_include/assert.h +++ b/ace/os_include/assert.h @@ -2,19 +2,19 @@ //============================================================================= /** - * @file assert.h + * @file os_assert.h * * verify program assertion * * $Id$ * - * @author Don Hinton <dhinton@ieee.org> + * @author Don Hinton <dhinton@dresystems.com> * @author This code was originally in various places including ace/OS.h. */ //============================================================================= -#ifndef ACE_OS_INCLUDE_ASSERT_H -#define ACE_OS_INCLUDE_ASSERT_H +#ifndef ACE_OS_INCLUDE_OS_ASSERT_H +#define ACE_OS_INCLUDE_OS_ASSERT_H #include "ace/pre.h" @@ -28,7 +28,19 @@ # include /**/ <assert.h> #endif /* !ACE_LACKS_ASSERT_H */ -// @todo define assert macro if needed.. +// Place all additions (especially function declarations) within extern "C" {} +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +#if defined (ACE_LACKS_ASSERT_MACRO) +# define assert(expr) +#endif + +#ifdef __cplusplus +} +#endif /* __cplusplus */ #include "ace/post.h" -#endif /* ACE_OS_INCLUDE_ASSERT_H */ +#endif /* ACE_OS_INCLUDE_OS_ASSERT_H */ |