diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2000-08-23 17:10:03 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2000-08-23 17:10:03 +0000 |
| commit | 3a43e16ae2c62b2ec0a8bcded8883b849d5b26bb (patch) | |
| tree | be9e24ff70fee6b2c61766371d5b80d08c8fa253 /byterun/misc.h | |
| parent | 7f2c1ed367e24f2f78b20f3e0bf840633e3e3fb3 (diff) | |
ajout Weak.get_copy
Assert -> CAMLassert
suppression des conjonctions dans les Assert
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3279 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/misc.h')
| -rw-r--r-- | byterun/misc.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/byterun/misc.h b/byterun/misc.h index 3212542a4..5666848cb 100644 --- a/byterun/misc.h +++ b/byterun/misc.h @@ -45,10 +45,10 @@ typedef char * addr; /* Assertions */ #ifdef DEBUG -#define Assert(x) if (!(x)) failed_assert ( #x , __FILE__, __LINE__) -void failed_assert (char *, char *, int) Noreturn; +#define CAMLassert(x) if (!(x)) caml_failed_assert ( #x , __FILE__, __LINE__) +void caml_failed_assert (char *, char *, int) Noreturn; #else -#define Assert(x) +#define CAMLassert(x) #endif void fatal_error (char *) Noreturn; @@ -96,4 +96,9 @@ char *aligned_malloc (asize_t, int, void **); #endif +#ifndef CAML_AVOID_CONFLICTS +#define Assert CAMLassert +#endif + + #endif /* _misc_ */ |