summaryrefslogtreecommitdiffstats
path: root/byterun/misc.h
diff options
context:
space:
mode:
Diffstat (limited to 'byterun/misc.h')
-rw-r--r--byterun/misc.h11
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_ */