Make all struct fields visible, don't hide them behind compile time config.h conditionals

diff --git a/include/atalk/globals.h b/include/atalk/globals.h
index 28d928b418a2264d51103628db3a82cb38a2bfd3..5d66c33c887bad2708d43cba902d2485a1bdd549 100644 (file)
--- a/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@ -7,11 +7,8 @@
 #define AFPD_GLOBALS_H 1
 
 #include <sys/param.h>
-
-#ifdef ADMIN_GRP
 #include <grp.h>
 #include <sys/types.h>
-#endif /* ADMIN_GRP */
 
 #ifdef HAVE_NETDB_H
 #include <netdb.h>  /* this isn't header-protected under ultrix */
@@ -98,9 +95,7 @@ struct afp_options {
     charset_t maccharset, unixcharset; 
     mode_t umask;
     mode_t save_mask;
-#ifdef ADMIN_GRP
     gid_t admingid;
-#endif /* ADMIN_GRP */
     int    volnamelen;
     /* default value for winbind authentication */
     char *ntdomain, *ntseparator;

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index 7a27c644daa864297d939dc6fa50f96549e69cc7..116a4ceca336e947c6ea9e21038ab267ddbb7249 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -90,9 +90,7 @@ struct vol {
     int             v_root_preexec_close;
     int             v_preexec_close;
     char            *v_uuid;    /* For TimeMachine zeroconf record */
-#ifdef __svr4__
-    int         v_qfd;
-#endif /*__svr4__*/
+    int             v_qfd;
 };
 
 /* load_volumes() flags */