X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fassertion.h;h=451257f5a2b1bbd7fbbb61838a9ba1fcf0ae398a;hp=39bb4f4e37fcc0afc2709ef078d809f01c3fd6a1;hb=dbb36db8d02b2c25af6bbfff8135112637936e1f;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/assertion.h b/ginac/assertion.h
index 39bb4f4e..451257f5 100644
--- a/ginac/assertion.h
+++ b/ginac/assertion.h
@@ -3,7 +3,7 @@
  *  Assertion macro definition. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -25,10 +25,12 @@
 
 #include <assert.h>
 
-#if defined(DO_GINAC_ASSERT) && !defined(ASSERT)
-#define ASSERT(X) assert(X)
+#if !defined(GINAC_ASSERT)
+#if defined(DO_GINAC_ASSERT)
+#define GINAC_ASSERT(X) assert(X)
 #else
-#define ASSERT(X) ((void)0)
+#define GINAC_ASSERT(X) ((void)0)
+#endif
 #endif
 
 #endif // ndef __GINAC_ASSERTION_H__