Changeset: e11c2948d162 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e11c2948d162 Modified Files: common/utils/mutils.c gdk/gdk_system.mx gdk/gdk_utils.mx Branch: Apr2011 Log Message:
build: make sure all sys/sysctl.h includes are preceeded by a sys/params.h For OpenBSD, it is necessary that sys/params.h is included before sys/sysctl.h is included. diffs (46 lines): diff --git a/common/utils/mutils.c b/common/utils/mutils.c --- a/common/utils/mutils.c +++ b/common/utils/mutils.c @@ -32,12 +32,12 @@ # include <mach-o/dyld.h> /* _NSGetExecutablePath on OSX >=10.5 */ #endif -#ifdef HAVE_SYS_PARAM_H -# include <sys/param.h> /* realpath on OSX */ +#ifdef HAVE_LIMITS_H +# include <limits.h> /* PATH_MAX on Solaris */ #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> /* PATH_MAX on Solaris */ +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> /* realpath on OSX, prerequisite of sys/sysctl on OpenBSD */ #endif #ifdef HAVE_SYS_SYSCTL_H diff --git a/gdk/gdk_system.mx b/gdk/gdk_system.mx --- a/gdk/gdk_system.mx +++ b/gdk/gdk_system.mx @@ -75,6 +75,9 @@ # include <semaphore.h> #endif +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */ +#endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif diff --git a/gdk/gdk_utils.mx b/gdk/gdk_utils.mx --- a/gdk/gdk_utils.mx +++ b/gdk/gdk_utils.mx @@ -60,6 +60,9 @@ # include <pwd.h> #endif +#ifdef HAVE_SYS_PARAM_H +# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */ +#endif #ifdef HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
