Minor fixes for SunOS.

3 files changed, 17 insertions, 21 deletions

diff --git a/examples/first.c b/examples/first.c
index 741f7c7e..d93e8f3b 100644
--- a/examples/first.c
+++ b/examples/first.c
@@ -359,7 +359,5 @@ main (int argc, char *argv [])
 		 data.proc_segment.start_code, data.proc_segment.end_code,
 		 data.proc_segment.start_stack);
 
-	fcloseall ();
-
 	exit (0);
 }
diff --git a/sysdeps/common/sysdeps.c b/sysdeps/common/sysdeps.c
index 93767226..61d653b4 100644
--- a/sysdeps/common/sysdeps.c
+++ b/sysdeps/common/sysdeps.c
@@ -21,25 +21,23 @@
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
 
-#define BIT_MASK(feature) (feature ? (1 << feature) : feature)
-
 const unsigned long glibtop_server_features =
-BIT_MASK(GLIBTOP_SUID_CPU) +
-BIT_MASK(GLIBTOP_SUID_MEM) +
-BIT_MASK(GLIBTOP_SUID_SWAP) +
-BIT_MASK(GLIBTOP_SUID_UPTIME) +
-BIT_MASK(GLIBTOP_SUID_LOADAVG) +
-BIT_MASK(GLIBTOP_SUID_SHM_LIMITS) +
-BIT_MASK(GLIBTOP_SUID_MSG_LIMITS) +
-BIT_MASK(GLIBTOP_SUID_SEM_LIMITS) +
-BIT_MASK(GLIBTOP_SUID_PROCLIST) +
-BIT_MASK(GLIBTOP_SUID_PROC_STATE) +
-BIT_MASK(GLIBTOP_SUID_PROC_UID) +
-BIT_MASK(GLIBTOP_SUID_PROC_MEM) +
-BIT_MASK(GLIBTOP_SUID_PROC_TIME) +
-BIT_MASK(GLIBTOP_SUID_PROC_SIGNAL) +
-BIT_MASK(GLIBTOP_SUID_PROC_KERNEL) +
-BIT_MASK(GLIBTOP_SUID_PROC_SEGMENT);
+GLIBTOP_SUID_CPU +
+GLIBTOP_SUID_MEM +
+GLIBTOP_SUID_SWAP +
+GLIBTOP_SUID_UPTIME +
+GLIBTOP_SUID_LOADAVG +
+GLIBTOP_SUID_SHM_LIMITS +
+GLIBTOP_SUID_MSG_LIMITS +
+GLIBTOP_SUID_SEM_LIMITS +
+GLIBTOP_SUID_PROCLIST +
+GLIBTOP_SUID_PROC_STATE +
+GLIBTOP_SUID_PROC_UID +
+GLIBTOP_SUID_PROC_MEM +
+GLIBTOP_SUID_PROC_TIME +
+GLIBTOP_SUID_PROC_SIGNAL +
+GLIBTOP_SUID_PROC_KERNEL +
+GLIBTOP_SUID_PROC_SEGMENT;
 
 /* Checks which features are implemented. */
 
diff --git a/sysdeps/sun4/close.c b/sysdeps/sun4/close.c
index ff7ebea4..02f2e5b3 100644
--- a/sysdeps/sun4/close.c
+++ b/sysdeps/sun4/close.c
@@ -24,5 +24,5 @@
 /* Closes pipe to gtop server. */
 
 void
-glibtop_close (glibtop *server)
+glibtop_close_l (glibtop *server)
 { }