diff options
| author | svnadmin <svnadmin@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2008-06-26 13:51:26 +0000 |
|---|---|---|
| committer | svnadmin <svnadmin@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2008-06-26 13:51:26 +0000 |
| commit | 9716af1598ddfd2ab8ee7198b35cca1df312c4fd (patch) | |
| tree | 5f903e795434362f0360ee2e3e65a27e6c6601c3 /src/include | |
| parent | 8cb0df53b3d5d615624b9bffdcc11cf13905cfc0 (diff) | |
Make "Erik" branch the default trunk for AHFinderDirect.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1526 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/config.h | 3 | ||||
| -rw-r--r-- | src/include/stdc.h | 15 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/include/config.h b/src/include/config.h index 106fc1c..0da3f35 100644 --- a/src/include/config.h +++ b/src/include/config.h @@ -42,8 +42,7 @@ typedef CCTK_INT integer; /* CCTK_VWarn() "warning level" for fatal errors (terminate execution) */ /* note low-level software uses error_exit() instead of CCTK_VWarn(), */ /* with exit codes defined in "stdc.h" */ -#define FATAL_ERROR 0 -#define SERIOUS_WARNING 1 +#define FATAL_ERROR (-1) /******************************************************************************/ diff --git a/src/include/stdc.h b/src/include/stdc.h index c8a5228..7a3ad4d 100644 --- a/src/include/stdc.h +++ b/src/include/stdc.h @@ -53,20 +53,20 @@ /******************************************************************************/ #ifdef __cplusplus -namespace AHFinderDirect - { namespace jtutil { #endif /* - * Low-level code in this thorn does error handling with error_exit() . - * In this this thorn this function is a wrapper around - * CCTK_VWarn(msg_level, ...) - * This function is declared to return int so it may be easily used in - * conditional expressions like + * Low-level code in this thorn is done with error_exit() . In this + * this thorn it's a wrapper around CCTK_VWarn(msg_level, ...) . It's + * declared to return int so it may be easily used in conditional + * expressions like * foo = bar_ok ? baz(bar) : error_exit(...); */ +#ifdef __cplusplus + extern "C" +#endif int error_exit(int msg_level, const char *format, ...) #ifdef __GNUC__ __attribute__ ((noreturn)) @@ -88,7 +88,6 @@ int error_exit(int msg_level, const char *format, ...) #ifdef __cplusplus } /* namespace jtutil */ - } /* namespace AHFinderDirect */ #endif /******************************************************************************/ |