1 files changed, 6 insertions, 64 deletions
diff --git a/PACE/pace/setjmp.h b/PACE/pace/setjmp.h
index 2d65710600e..3fb8857389e 100644
--- a/PACE/pace/setjmp.h
+++ b/PACE/pace/setjmp.h
@@ -13,75 +13,17 @@
  *
  * ============================================================================ */
 
-#ifndef PACE_SETJMP_H
-#define PACE_SETJMP_H
+#ifndef PACE_SETJMP_H_INDIRECT
+#define PACE_SETJMP_H_INDIRECT
 
 #include "pace/config/defines.h"
 
-#if (PACE_HAS_POSIX)
+#if defined (PACE_HAS_POSIX)
 # include "pace/posix/setjmp.h"
-#elif (PACE_VXWORKS)
+#elif defined (PACE_VXWORKS)
 # include "pace/vxworks/setjmp.h"
-#elif (PACE_WIN32)
+#elif defined (PACE_WIN32)
 # include "pace/win32/setjmp.h"
 #endif
 
-#if defined (PACE_HAS_CPLUSPLUS)
-extern "C" {
-#endif /* PACE_HAS_CPLUSPLUS */
-
-  /**
-     PACE's implementation of the POSIX function setjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_INLINE int pace_setjmp (pace_jmp_buf env);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function sigsetjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_INLINE int pace_sigsetjmp (pace_sigjmp_buf env, int savemask);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-  /**
-     PACE's implementation of the POSIX function longjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_CLS_UOF)
-  PACE_INLINE void pace_longjmp (pace_jmp_buf env, int val);
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-  /**
-     PACE's implementation of the POSIX function siglongjmp.
-     See POSIX standard (Internation Standard ISO/IEC 9945-1:1996;
-     IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
-   */
-#if (PACE_HAS_POSIX_SIG_UOF)
-  PACE_INLINE void pace_siglongjmp (pace_sigjmp_buf env, int val);
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#if defined (PACE_HAS_INLINE)
-#  if (PACE_HAS_POSIX)
-#    include "pace/posix/setjmp.inl"
-#  elif (PACE_VXWORKS)
-#    include "pace/vxworks/setjmp.inl"
-#  elif (PACE_WIN32)
-#    include "pace/win32/setjmp.inl"
-#  endif
-#endif /* PACE_HAS_INLINE */
-
-#if defined (PACE_HAS_CPLUSPLUS)
-}
-#endif /* PACE_HAS_CPLUSPLUS */
-
-#endif /* PACE_SETJMP_H */
+#endif /* PACE_SETJMP_H_INDIRECT */