Wed Feb 28 15:04:41 2001 Joe Hoffert <joeh@cs.wustl.edu>

5 files changed, 25 insertions, 23 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 52015743012..375b1a9302b 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,18 @@
+Wed Feb 28 15:04:41 2001  Joe Hoffert  <joeh@cs.wustl.edu>
+
+        * pace/posix/string.inl (pace_strtok_r):
+          Added call to strtok_r for Lynx and SunOS since it is
+          supported but PACE_HAS_REENTRANT doesn't get defined
+          for them.
+
+        * pace/posix/setjmp.inl:
+        * pace/setjmp.h:
+          Changed setjmp and sigsetjmp from functions to macros since
+          the functions were causing warnings on linux (Red Hat 7).
+
+        * include/makeinclude/rules.common.GNU:
+          Added support for Solaris 8
+
 Fri Feb  9 19:35:29 2001  Luther J Baker  <luther@cs.wustl.edu>
 
         * pace/config/compiler.h
diff --git a/PACE/include/makeinclude/rules.common.GNU b/PACE/include/makeinclude/rules.common.GNU
index 4d7f5a5e061..ebcdc1a2712 100644
--- a/PACE/include/makeinclude/rules.common.GNU
+++ b/PACE/include/makeinclude/rules.common.GNU
@@ -42,8 +42,11 @@ endif # PACE_SYSNAME == Linux
 # AIX               AIX
 
 ifeq ($(PACE_SYSNAME),SunOS)
-  # Hard code special cases for SunOS 5.6 and 5.7 since we
-  # need a 3 digit version number for comparison purposes.
+  # Hard code special cases for SunOS 5.6, 5.7, and 5.8 since
+  # we need a 3 digit version number for comparison purposes.
+  ifeq ($(PACE_SYSVER),58)
+    PACE_SYSVER := $(PACE_SYSVER)0
+  endif # PACE_SYSVER == 58
   ifeq ($(PACE_SYSVER),57)
     PACE_SYSVER := $(PACE_SYSVER)0
   endif # PACE_SYSVER == 57
diff --git a/PACE/pace/posix/setjmp.inl b/PACE/pace/posix/setjmp.inl
index 0e5ad69026c..e51bcb77167 100644
--- a/PACE/pace/posix/setjmp.inl
+++ b/PACE/pace/posix/setjmp.inl
@@ -15,24 +15,6 @@
 
 #if (PACE_HAS_POSIX_CLS_UOF)
 PACE_INLINE
-int
-pace_setjmp (pace_jmp_buf env)
-{
-  return setjmp (env);
-}
-#endif /* PACE_HAS_POSIX_CLS_UOF */
-
-#if (PACE_HAS_POSIX_SIG_UOF)
-PACE_INLINE
-int
-pace_sigsetjmp (pace_sigjmp_buf env, int savemask)
-{
-  return sigsetjmp (env, savemask);
-}
-#endif /* PACE_HAS_POSIX_SIG_UOF */
-
-#if (PACE_HAS_POSIX_CLS_UOF)
-PACE_INLINE
 void
 pace_longjmp (pace_jmp_buf env, int val)
 {
diff --git a/PACE/pace/posix/string.inl b/PACE/pace/posix/string.inl
index a09022bf59e..de23cfacf52 100644
--- a/PACE/pace/posix/string.inl
+++ b/PACE/pace/posix/string.inl
@@ -193,7 +193,7 @@ PACE_INLINE
 char *
 pace_strtok_r (char * s, const char * sep, char ** lasts)
 {
-# if defined (PACE_HAS_REENTRANT)
+# if defined (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS)    
   return strtok_r (s, sep, lasts);
 # else  /* ! PACE_HAS_REENTRANT */
   PACE_UNUSED_ARG (s);
diff --git a/PACE/pace/setjmp.h b/PACE/pace/setjmp.h
index eaaea6057ff..17cd17fb9a2 100644
--- a/PACE/pace/setjmp.h
+++ b/PACE/pace/setjmp.h
@@ -36,7 +36,8 @@ extern "C" {
      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);
+  /* int pace_setjmp (pace_jmp_buf env); */
+# define pace_setjmp setjmp
 #endif /* PACE_HAS_POSIX_CLS_UOF */
 
   /**
@@ -45,7 +46,8 @@ extern "C" {
      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);
+  /* int pace_sigsetjmp (pace_sigjmp_buf env, int savemask); */
+# define pace_sigsetjmp setjmp
 #endif /* PACE_HAS_POSIX_SIG_UOF */
 
   /**