Remove obsolete retsigtype

[openafs.git] / src / kopenafs / kopenafs.c

diff --git a/src/kopenafs/kopenafs.c b/src/kopenafs/kopenafs.c
index 9d987a6..0a59cc8 100644 (file)
--- a/src/kopenafs/kopenafs.c
+++ b/src/kopenafs/kopenafs.c
@@ -11,31 +11,26 @@
  * Glue code for the kopenafs API.  Mostly just wrappers around the functions
  * included in the libsys code.
  */
+#include <afsconfig.h>
+#include <afs/param.h>
+
+#include <roken.h>
 
-#include <errno.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <stdlib.h>
 #ifdef AFS_AIX51_ENV
 # include <sys/cred.h>
 # ifdef HAVE_SYS_PAG_H
 #  include <sys/pag.h>
 # endif
 #endif
-#include <sys/param.h>
-#include <unistd.h>
 
-#include <afsconfig.h>
 #include <afs/afssyscalls.h>
-#include <afs/param.h>
 #include <kopenafs.h>
 
 static volatile sig_atomic_t syscall_okay = 1;
 
 /* Signal handler to catch failed system calls and change the okay flag. */
 #ifdef SIGSYS
-static RETSIGTYPE
+static void
 sigsys_handler(int s)
 {
     syscall_okay = 0;
@@ -48,7 +43,7 @@ k_hasafs(void)
 {
     struct ViceIoctl iob;
     int okay, saved_errno;
-    RETSIGTYPE (*saved_func)(int);
+    void (*saved_func)(int);
 
     saved_errno = errno;
 
@@ -132,7 +127,7 @@ os_haspag(void)
     gid_t *groups;
     afs_uint32 g0, g1;
     afs_uint32 h, l, pag;
-# ifdef AFS_LINUX26_ENV
+# ifdef AFS_PAG_ONEGROUP_ENV
     int i;
 # endif
 
@@ -142,8 +137,8 @@ os_haspag(void)
         return 0;
     ngroups = getgroups(ngroups, groups);
 
-    /* Check for AFS_LINUX26_ONEGROUP_ENV PAGs. */
-# ifdef AFS_LINUX26_ENV
+    /* Check for one-group PAGs. */
+# ifdef AFS_PAG_ONEGROUP_ENV
     for (i = 0; i < ngroups; i++)
         if (((groups[i] >> 24) & 0xff) == 'A') {
             free(groups);