2 files changed, 28 insertions, 31 deletions
diff --git a/include/cmsys.h b/include/cmsys.h
index 9b3ccef3..d1014291 100644
--- a/include/cmsys.h
+++ b/include/cmsys.h
@@ -80,12 +80,6 @@ extern int toconnect(const char *addr);
 extern int toread(int fd, void *buf, int len);
 extern int towrite(int fd, const void *buf, int len);
 
-/* osdep */
-extern int cpuload(char *str);
-extern void initsetproctitle(int argc, char **argv, char **envp);
-extern void setproctitle(const char* format, ...) GCC_CHECK_FORMAT(1,2);
-
-
 /* sort.c */
 extern int cmp_int(const void *a, const void *b);
 extern int cmp_int_desc(const void * a, const void * b);
diff --git a/include/osdep.h b/include/osdep.h
index 17462069..594259d8 100644
--- a/include/osdep.h
+++ b/include/osdep.h
@@ -1,46 +1,49 @@
-
+/* $Id */
 #ifndef __OSDEP_H__
 #define __OSDEP_H__
 
-/* os dependant include file, define */
-#ifdef __FreeBSD__
-    #if __FreeBSD__ >= 5
-        #include <sys/limits.h>
-    #else
-        #include <machine/limits.h>
-    #endif
-
-    #include <machine/param.h>
-
-    #define HAVE_SETPROCTITLE
+#ifdef __GNUC__
+#define GCC_CHECK_FORMAT(a,b) __attribute__ ((format (printf, a, b)))
+#else
+#define GCC_CHECK_FORMAT(a,b)
+#endif
 
-#elif defined(__linux__)
+/* os dependant include file, define */
+#ifdef __linux__
 
 #ifndef _GNU_SOURCE
-    #define _GNU_SOURCE	       /* for strcasestr */
+#define _GNU_SOURCE	       /* for strcasestr */
 #endif
-    #include <sys/ioctl.h>
-    #include <sys/file.h>      /* for flock() */
-    #include <strings.h>       /* for strcasecmp() */
 
-    #define NEED_STRLCPY
-    #define NEED_STRLCAT
+#include <sys/ioctl.h>
+#include <sys/file.h>      /* for flock() */
+#include <strings.h>       /* for strcasecmp() */
 
-#else
-
-    #error "Unknown OSTYPE"
+#define NEED_STRLCPY
+#define NEED_STRLCAT
+#define NEED_SETPROCTITLE
 
+#elif ! defined(__FreeBSD__)
+#error "Unknown OSTYPE"
 #endif
 
-
 #define Signal (signal)
 
 #ifdef NEED_STRLCPY
-    size_t strlcpy(char *dst, const char *src, size_t size);
+size_t strlcpy(char *dst, const char *src, size_t size);
 #endif
+
 #ifdef NEED_STRLCAT
-    size_t strlcat(char *dst, const char *src, size_t size);
+size_t strlcat(char *dst, const char *src, size_t size);
 #endif
 
+#ifdef NEED_SETPROCTITLE
+#include <stdarg.h>
+extern void initsetproctitle(int argc, char **argv, char **envp);
+extern void setproctitle(const char* format, ...) GCC_CHECK_FORMAT(1,2);
+#else
+#define initsetproctitle(...)
+#endif
 
+extern int cpuload(char *str);
 #endif