diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bmon/config.h | 6 | ||||
| -rw-r--r-- | include/bmon/list.h | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/bmon/config.h b/include/bmon/config.h index e717245..ad6a367 100644 --- a/include/bmon/config.h +++ b/include/bmon/config.h @@ -46,7 +46,11 @@ #include <syslog.h> #include <sys/wait.h> #include <dirent.h> -#include <values.h> +#ifdef SYS_BSD +# include <float.h> +#else +# include <values.h> +#endif #if TIME_WITH_SYS_TIME # include <sys/time.h> diff --git a/include/bmon/list.h b/include/bmon/list.h index c7569d7..fff9409 100644 --- a/include/bmon/list.h +++ b/include/bmon/list.h @@ -8,6 +8,14 @@ #ifndef BMON_LIST_H_ #define BMON_LIST_H_ +#ifdef __APPLE__ +/* Apple systems define these macros in system headers, so we undef + * them prior to inclusion of this file */ +#undef LIST_HEAD +#undef LIST_HEAD_INIT +#undef INIT_LIST_HEAD +#endif + struct list_head { struct list_head * next; |