4 files changed, 11 insertions, 4 deletions
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index 51569f6ec9..f84ccf7c87 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -84,6 +84,7 @@ debug opt: $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
+	rm -rf $(OBJDIR)
 	rm -f core *~
 
 docs:
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index 7372d5b0e8..e9fd75a32c 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #if defined(__sun__)
 #include <kstat.h>
@@ -120,7 +121,9 @@ typedef struct {
 
 static void util_measure(unsigned int **result_vec, int *result_sz);
 
+#if defined(__sun__)
 static unsigned int misc_measure(char* name);
+#endif
 static void send(unsigned int data);
 static void sendv(unsigned int data[], int ints);
 static void error(char* err_msg);
@@ -140,7 +143,9 @@ int main(int argc, char** argv) {
   int rc;
   int sz;
   unsigned int *rv;
+#if defined(__linux__)
   unsigned int no_of_cpus = 0;
+#endif
 
 #if defined(__sun__)
   kstat_ctl = kstat_open();
@@ -288,10 +293,10 @@ static unsigned int misc_measure(char* name) {
   if(!entry)
     return -1;
   
-  if(entry->data_type != KSTAT_DATA_ULONG)
+  if(entry->data_type != KSTAT_DATA_UINT32)
     return -1;
 
-  return entry->value.ul;
+  return entry->value.ui32;
 }
 
 
diff --git a/lib/os_mon/c_src/ferrule.c b/lib/os_mon/c_src/ferrule.c
index 744f302b2d..c55f594f34 100644
--- a/lib/os_mon/c_src/ferrule.c
+++ b/lib/os_mon/c_src/ferrule.c
@@ -50,7 +50,7 @@
 #define		FDS_STDIN	0
 #define		FDS_PIPE	1
 
-main(int argc, char *argv[])
+int	main(int argc, char *argv[])
 /*	usage: ferrule ownpath */
 {
     int		i, pipe_fd;
diff --git a/lib/os_mon/c_src/mod_syslog.c b/lib/os_mon/c_src/mod_syslog.c
index 87fbfbac22..b1bbf80b2a 100644
--- a/lib/os_mon/c_src/mod_syslog.c
+++ b/lib/os_mon/c_src/mod_syslog.c
@@ -47,7 +47,7 @@
 #define		TRUE		1
 #define		WAIT		1
 
-main(int argc, char *argv[])
+int	main(int argc, char *argv[])
 /*	usage: mod_syslog mode ownpath syslogconf */
 {
     int	syslogd_pid, n_lines_copied=0;
@@ -128,6 +128,7 @@ main(int argc, char *argv[])
        make_exit(PIPE_NOT_FOUND);
        else */
     make_exit(OK);
+    return 0;
 }
 
 void	make_exit(int exit_code)