Fri Jul 28 06:28:26 2000 John Heitmann <jwh1@cs.wustl.edu>

5 files changed, 51 insertions, 49 deletions

diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index dd15859308f..4b6c77ded1c 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jul 28 06:28:26 2000  John Heitmann  <jwh1@cs.wustl.edu>
+
+	* pace/posix/dirent.inl
+	* pace/posix/grp.inl
+	* pace/posix/pwd.inl
+	* pace/posix/signal.inl
+	  Got rid of PACE_HAS_PTHREAD_SEMANTICS not supported code
+	  in favor of platform specific modifications.
+
 Thu Jul 27 15:02:53 2000  Luther J Baker  <luther@cs.wustl.edu>
 
 	* pace/config/utility.h:
diff --git a/PACE/pace/posix/dirent.inl b/PACE/pace/posix/dirent.inl
index 6279866d932..87b2cdf3a27 100644
--- a/PACE/pace/posix/dirent.inl
+++ b/PACE/pace/posix/dirent.inl
@@ -37,14 +37,14 @@ int
 pace_readdir_r (PACE_DIR * dirp, pace_dirent * entry,
                 pace_dirent ** result)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+#if (PACE_SUNOS)
+  *result = readdir_r (dirp, entry);
+  if (*result == 0)
+    return errno;
+  return 0;
+#else
   return readdir_r (dirp, entry, result);
-# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (dirp);
-  PACE_UNUSED_ARG (entry);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_CLSR_UOF */
 
diff --git a/PACE/pace/posix/grp.inl b/PACE/pace/posix/grp.inl
index 2b437c9a78d..740376de935 100644
--- a/PACE/pace/posix/grp.inl
+++ b/PACE/pace/posix/grp.inl
@@ -31,16 +31,14 @@ pace_getgrgid_r (pace_gid_t gid,
                  size_t bufsize,
                  pace_group ** result)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+#if (PACE_SUNOS)
+  *result = getgrgid_r (gid, grp, buffer, bufsize);
+  if (*result == 0)
+    return errno;
+  return 0;
+#else
   return getgrgid_r (gid, grp, buffer, bufsize, result);
-# else /* !PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (gid);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* !PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_SDR_UOF */
 
@@ -62,15 +60,13 @@ pace_getgrnam_r (const char * name,
                   size_t bufsize,
                   pace_group ** result)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+#if (PACE_SUNOS)
+  *result = getgrnam_r (name, grp, buffer, bufsize);
+  if (*result == 0)
+    return errno;
+  return 0;
+#else
   return getgrnam_r (name, grp, buffer, bufsize, result);
-# else /* !PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (grp);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* !PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/posix/pwd.inl b/PACE/pace/posix/pwd.inl
index 87956e12ec3..a8d0d25d69c 100644
--- a/PACE/pace/posix/pwd.inl
+++ b/PACE/pace/posix/pwd.inl
@@ -31,16 +31,14 @@ pace_getpwuid_r (pace_uid_t uid,
                  pace_size_t bufsize,
                  pace_passwd ** result)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+#if (PACE_SUNOS)
+  *result = getpwuid_r (uid, pwd, buffer, bufsize);
+  if (*result == 0)
+    return errno;
+  return 0;
+#else
   return getpwuid_r (uid, pwd, buffer, bufsize, result);
-# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (uid);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_SDR_UOF */
 
@@ -62,15 +60,13 @@ pace_getpwnam_r (const char * name,
                  pace_size_t bufsize,
                  pace_passwd ** result)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+# if (PACE_SUNOS)
+  *result = getpwnam_r (name, pwd, buffer, bufsize);
+  if (*result == 0)
+    return errno;
+  return 0;
+#else
   return getpwnam_r (name, pwd, buffer, bufsize, result);
-# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (name);
-  PACE_UNUSED_ARG (pwd);
-  PACE_UNUSED_ARG (buffer);
-  PACE_UNUSED_ARG (bufsize);
-  PACE_UNUSED_ARG (result);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_SDR_UOF */
diff --git a/PACE/pace/posix/signal.inl b/PACE/pace/posix/signal.inl
index 0a8a58cd93a..6eca86e9fbf 100644
--- a/PACE/pace/posix/signal.inl
+++ b/PACE/pace/posix/signal.inl
@@ -152,13 +152,14 @@ PACE_INLINE
 int
 pace_sigwait (const pace_sigset_t * set, int * sig)
 {
-# if defined (PACE_HAS_POSIX_PTHREAD_SEMANTICS)
+#if (PACE_SUNOS)
+  *sig = sigwait ((pace_sigset_t *)set);
+  if (*sig == -1)
+    return -1;
+  return 0;
+#else
   return sigwait (set, sig);
-# else /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
-  PACE_UNUSED_ARG (set);
-  PACE_UNUSED_ARG (sig);
-  PACE_ERRNO_NO_SUPPORT_RETURN (-1);
-# endif /* ! PACE_HAS_POSIX_PTHREAD_SEMANTICS */
+#endif /* PACE_SUNOS */
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */