OSSP CVS Repository

ossp - Check-in [1763]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1763
Date: 2002-Jan-31 20:54:05 (local)
2002-Jan-31 19:54:05 (UTC)
User:rse
Branch:
Comment: remove USE in macro names. It is already clear without this.
Tickets:
Inspections:
Files:
ossp-pkg/ex/ex.h      1.13 -> 1.14     5 inserted, 5 deleted

ossp-pkg/ex/ex.h 1.13 -> 1.14

--- ex.h 2002/01/30 10:37:55     1.13
+++ ex.h 2002/01/31 19:54:05     1.14
@@ -54,21 +54,21 @@
 #endif
 
 /* the machine context */
-#if defined(__EX_MCTX_USE_MCSC__)
+#if defined(__EX_MCTX_MCSC__)
 #include <ucontext.h>            /* POSIX.1 ucontext(3) */
 #define __ex_mctx_struct         ucontext_t uc; 
 #define __ex_mctx_save(mctx)     (getcontext(&(mctx)->uc) == 0)
 #define __ex_mctx_restored(mctx) /* noop */
 #define __ex_mctx_restore(mctx)  (void)setcontext(&(mctx)->uc)
 
-#elif defined(__EX_MCTX_USE_SSJLJ__)
+#elif defined(__EX_MCTX_SSJLJ__)
 #include <setjmp.h>              /* POSIX.1 sigjmp_buf(3) */
 #define __ex_mctx_struct         sigjmp_buf jb;
 #define __ex_mctx_save(mctx)     (sigsetjmp((mctx)->jb, 1) == 0)
 #define __ex_mctx_restored(mctx) /* noop */
 #define __ex_mctx_restore(mctx)  (void)siglongjmp((mctx)->jb, 1)
 
-#elif defined(__EX_MCTX_USE_SJLJ__) || !defined(__EX_MCTX_USE_CUSTOM__)
+#elif defined(__EX_MCTX_SJLJ__) || !defined(__EX_MCTX_CUSTOM__)
 #include <setjmp.h>              /* ISO C jmp_buf(3) */
 #define __ex_mctx_struct         jmp_buf jb;
 #define __ex_mctx_save(mctx)     (setjmp((mctx)->jb) == 0)
@@ -207,14 +207,14 @@
     (__ex_ctx()->ctx_disabled)
 
 /* optional namespace mapping */
-#if defined(__EX_NS_USE_UCCXX__)
+#if defined(__EX_NS_UCCXX__)
 #define Try      ex_try
 #define Cleanup  ex_cleanup
 #define Catch    ex_catch
 #define Throw    ex_throw
 #define Rethrow  ex_rethrow
 #define Shield   ex_shield
-#elif defined(__EX_NS_USE_CXX__) || (!defined(__cplusplus) && !defined(__EX_NS_USE_CUSTOM__))
+#elif defined(__EX_NS_CXX__) || (!defined(__cplusplus) && !defined(__EX_NS_CUSTOM__))
 #define try      ex_try
 #define cleanup  ex_cleanup
 #define catch    ex_catch

CVSTrac 2.0.1