Changeset: baa33bdc0efc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=baa33bdc0efc
Modified Files:
NT/monetdb_config.h.in
common/utils/mutils.c
configure.ag
gdk/gdk_posix.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
tools/merovingian/daemon/merovingian.c
Branch: Apr2019
Log Message:
Fedora 31 compilation fixes, the sys/sysctl.h is deprecated, leave it to BSD
like systems compilation
diffs (154 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -512,9 +512,6 @@
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
-/* Define to 1 if you have the <sys/sysctl.h> header file. */
-/* #undef HAVE_SYS_SYSCTL_H */
-
/* Define to 1 if you have the <sys/times.h> header file. */
/* #undef HAVE_SYS_TIMES_H */
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -25,10 +25,10 @@
#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 */
+# include <sys/param.h> /* realpath on OSX */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h> /* KERN_PROC_PATHNAME on BSD */
#endif
@@ -454,7 +454,7 @@ get_bin_path(void)
if (_NSGetExecutablePath(buf, &size) == 0 &&
realpath(buf, _bin_path) != NULL)
return _bin_path;
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(KERN_PROC_PATHNAME) /* BSD */
+#elif defined(BSD) && defined(KERN_PROC_PATHNAME) /* BSD */
int mib[4];
size_t cb = sizeof(_bin_path);
mib[0] = CTL_KERN;
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2417,7 +2417,6 @@ AC_CHECK_HEADERS([ \
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
@@ -34,7 +34,7 @@
#ifdef HAVE_MACH_MACH_INIT_H
# include <mach/mach_init.h>
#endif
-#if defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
+#if defined(HAVE_KVM_H)
# include <kvm.h>
# include <sys/param.h>
# include <sys/sysctl.h>
@@ -297,7 +297,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) && defined(HAVE_SYS_SYSCTL_H)
+#elif defined(HAVE_KVM_H)
/* get RSS on FreeBSD and NetBSD */
struct kinfo_proc *ki;
int ski = 1;
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -857,7 +857,7 @@ MT_check_nr_cores(void)
#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
/* this works on Linux, Solaris and AIX */
ncpus = sysconf(_SC_NPROCESSORS_ONLN);
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_NCPU) /* BSD */
+#elif defined(HW_NCPU) /* BSD */
size_t len = sizeof(int);
int mib[3];
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -98,7 +98,7 @@
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h>
#endif
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -38,7 +38,7 @@ int GDKverbose = 0;
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h> /* prerequisite of sys/sysctl on OpenBSD */
#endif
-#ifdef HAVE_SYS_SYSCTL_H
+#ifdef BSD /* BSD macro is defined in sys/param.h */
# include <sys/sysctl.h>
#endif
#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT)
@@ -311,7 +311,7 @@ MT_init(void)
GetSystemInfo(&sysInfo);
_MT_pagesize = sysInfo.dwPageSize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PAGESIZE)
+#elif defined(BSD) && defined(HW_PAGESIZE)
{
int size;
size_t len = sizeof(int);
@@ -338,7 +338,7 @@ MT_init(void)
if (GlobalMemoryStatusEx(&memStatEx))
_MT_npages = (size_t) (memStatEx.ullTotalPhys /
_MT_pagesize);
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_MEMSIZE) && SIZEOF_SIZE_T ==
SIZEOF_LNG
+#elif defined(BSD) && defined(HW_MEMSIZE) && SIZEOF_SIZE_T == SIZEOF_LNG
/* Darwin, 64-bits */
{
uint64_t size = 0;
@@ -352,7 +352,7 @@ MT_init(void)
sysctl(mib, 2, &size, &len, NULL, 0);
_MT_npages = size / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined (HW_PHYSMEM64) && SIZEOF_SIZE_T ==
SIZEOF_LNG
+#elif defined(BSD) && defined (HW_PHYSMEM64) && SIZEOF_SIZE_T == SIZEOF_LNG
/* OpenBSD, 64-bits */
{
int64_t size = 0;
@@ -366,7 +366,7 @@ MT_init(void)
sysctl(mib, 2, &size, &len, NULL, 0);
_MT_npages = size / _MT_pagesize;
}
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_PHYSMEM)
+#elif defined(BSD) && defined(HW_PHYSMEM)
/* NetBSD, OpenBSD, Darwin, 32-bits; FreeBSD 32 & 64-bits */
{
# ifdef __FreeBSD__
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -421,7 +421,7 @@ main(int argc, char *argv[])
#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
/* this works on Linux, Solaris and AIX */
ncpus = sysconf(_SC_NPROCESSORS_ONLN);
-#elif defined(HAVE_SYS_SYSCTL_H) && defined(HW_NCPU) /* BSD */
+#elif defined(HW_NCPU) /* BSD */
size_t len = sizeof(int);
int mib[3];
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
