From c54ad52a9943c1b3f582a8434614c9e3d15e8a94 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Sat, 6 Sep 2008 18:22:19 +0000 Subject: [PATCH] compile on FreeBSD 7 --- bindings/java/src/jni/javasigar.c | 2 ++ src/os/darwin/darwin_sigar.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bindings/java/src/jni/javasigar.c b/bindings/java/src/jni/javasigar.c index ed0633dd..2cd85b3d 100644 --- a/bindings/java/src/jni/javasigar.c +++ b/bindings/java/src/jni/javasigar.c @@ -1613,7 +1613,9 @@ JNIEXPORT jlong SIGAR_JNI(ResourceLimit_INFINITY) #ifdef WIN32 return 0x7fffffff; #else +#ifndef __FreeBSD__ #include +#endif #include return RLIM_INFINITY; #endif diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index a929da0e..4283c183 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -1788,7 +1788,9 @@ static void get_fs_options(char *opts, int osize, long flags) if (flags & MNT_SYNCHRONOUS) strncat(opts, ",sync", osize); if (flags & MNT_NOEXEC) strncat(opts, ",noexec", osize); if (flags & MNT_NOSUID) strncat(opts, ",nosuid", osize); +#ifdef MNT_NODEV if (flags & MNT_NODEV) strncat(opts, ",nodev", osize); +#endif #ifdef MNT_UNION if (flags & MNT_UNION) strncat(opts, ",union", osize); #endif