Changeset: 6a3f1d6ec913 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a3f1d6ec913
Modified Files:
configure.ag
gdk/gdk_posix.c
Branch: default
Log Message:
Solaris has kvm.h but no sys/sysctl.h
diffs (32 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2384,6 +2384,7 @@ AC_CHECK_HEADERS([crypt.h \
sys/param.h \
sys/resource.h \
sys/socket.h \
+ sys/sysctl.h \
sys/time.h \
sys/times.h \
sys/types.h \
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -53,7 +53,7 @@ extern char *sbrk(int);
#ifdef HAVE_MACH_MACH_INIT_H
# include <mach/mach_init.h>
#endif
-#ifdef HAVE_KVM_H
+#if defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
# include <kvm.h>
# include <sys/param.h>
# include <sys/sysctl.h>
@@ -787,7 +787,7 @@ MT_getrss(void)
if (task_info(task, TASK_BASIC_INFO_64, (task_info_t)&t_info,
&t_info_count) != KERN_INVALID_POLICY)
return t_info.resident_size; /* bytes */
-#elif defined(HAVE_KVM_H)
+#elif defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
/* get RSS on FreeBSD */
struct kinfo_proc *ki;
int ski = 1;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
