summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2014-05-20 22:04:21 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2014-05-20 22:04:21 -0700
commit51970b9a6f51fdb23ccdd566b48594aeb593eb11 (patch)
tree5faa941cecc3bdee0948f71a970b40d3f3ba4f3d
parentb240bc3633a56db6dbd0b1c8fa465b186814f1b7 (diff)
unifdef -USABER
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--include/assert.h4
-rw-r--r--os/error.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/include/assert.h b/include/assert.h
index 23817e6..cdc5350 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -46,11 +46,7 @@ in this Software without prior written authorization from The Open Group.
*/
#ifdef DEBUG
#include <stdio.h>
-#ifdef SABER
-#define assert(ex) {if (!(ex)){(void)fprintf(stderr,"Assertion \"ex\" failed: file \"%s\", line %d\n", __FILE__, __LINE__);saber_stop();}}
-#else
#define assert(ex) {if (!(ex)){(void)fprintf(stderr,"Assertion \"ex\" failed: file \"%s\", line %d\n", __FILE__, __LINE__);abort();}}
-#endif
#else
#define assert(ex)
#endif
diff --git a/os/error.c b/os/error.c
index d868ede..2ab84f6 100644
--- a/os/error.c
+++ b/os/error.c
@@ -71,11 +71,7 @@ abort_server(void)
{
fflush(stderr);
-#ifdef SABER
- saber_stop();
-#else
_exit(1);
-#endif
}
void