Changeset: 92a9241c58d4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/92a9241c58d4
Modified Files:
cmake/monetdb-defines.cmake
monetdb_config.h.in
sql/backends/monet5/UDF/pyapi3/undef.h
tools/mserver/mserver5.c
Branch: Aug2024
Log Message:
Cleanup: only test for features if we use the result.
diffs (154 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -20,14 +20,10 @@ function(monetdb_configure_defines)
check_include_file("fcntl.h" HAVE_FCNTL_H)
# use find_path for getopt.h since we need the path on Windows
find_path(HAVE_GETOPT_H "getopt.h")
- check_include_file("io.h" HAVE_IO_H)
check_include_file("kvm.h" HAVE_KVM_H)
- check_include_file("libgen.h" HAVE_LIBGEN_H)
- check_include_file("libintl.h" HAVE_LIBINTL_H)
check_include_file("mach/mach_init.h" HAVE_MACH_MACH_INIT_H)
check_include_file("mach/task.h" HAVE_MACH_TASK_H)
check_include_file("mach-o/dyld.h" HAVE_MACH_O_DYLD_H)
- check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
check_include_file("poll.h" HAVE_POLL_H)
check_include_file("procfs.h" HAVE_PROCFS_H)
check_include_file("pwd.h" HAVE_PWD_H)
@@ -42,13 +38,11 @@ function(monetdb_configure_defines)
check_include_files("stdlib.h;sys/random.h" HAVE_SYS_RANDOM_H)
check_include_file("sys/resource.h" HAVE_SYS_RESOURCE_H)
check_include_file("sys/stat.h" HAVE_SYS_STAT_H)
- check_include_file("sys/sysctl.h" HAVE_SYS_SYSCTL_H)
check_include_file("sys/termios.h" HAVE_TERMIOS_H)
check_include_file("sys/times.h" HAVE_SYS_TIMES_H)
check_include_file("sys/types.h" HAVE_SYS_TYPES_H)
check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
check_include_file("sys/un.h" HAVE_SYS_UN_H)
- check_include_file("sys/wait.h" HAVE_SYS_WAIT_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("winsock2.h" HAVE_WINSOCK_H)
@@ -105,23 +99,15 @@ function(monetdb_configure_defines)
# Some POSIX systems don't have it (e.g. Macos)
check_symbol_exists("posix_fallocate" "fcntl.h" HAVE_POSIX_FALLOCATE)
check_symbol_exists("posix_madvise" "sys/mman.h" HAVE_POSIX_MADVISE)
- check_function_exists("putenv" HAVE_PUTENV)
check_function_exists("setsid" HAVE_SETSID)
check_function_exists("shutdown" HAVE_SHUTDOWN)
check_function_exists("sigaction" HAVE_SIGACTION)
check_function_exists("siglongjmp" HAVE_SIGLONGJMP)
- check_symbol_exists("stpcpy" "string.h" HAVE_STPCPY)
- check_function_exists("strcasestr" HAVE_STRCASESTR)
- check_symbol_exists("strncasecmp" "strings.h" HAVE_STRNCASECMP)
check_function_exists("strptime" HAVE_STRPTIME)
- check_function_exists("strsignal" HAVE_STRSIGNAL)
check_symbol_exists("sysconf" "unistd.h" HAVE_SYSCONF)
check_function_exists("task_info" HAVE_TASK_INFO)
check_function_exists("times" HAVE_TIMES)
check_function_exists("uname" HAVE_UNAME)
- check_symbol_exists("wcwidth" "wchar.h" HAVE_WCWIDTH)
- # Some libc versions on Linux distributions don't have it
- check_symbol_exists("semtimedop" "sys/types.h;sys/ipc.h;sys/sem.h"
HAVE_SEMTIMEDOP)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
check_function_exists("pthread_kill" HAVE_PTHREAD_KILL)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -86,15 +86,11 @@
#cmakedefine HAVE_DISPATCH_DISPATCH_H 1
#cmakedefine HAVE_DLFCN_H 1
#cmakedefine HAVE_FCNTL_H 1
-#cmakedefine HAVE_IO_H 1
#cmakedefine HAVE_KVM_H 1
-#cmakedefine HAVE_LIBGEN_H 1
-#cmakedefine HAVE_LIBINTL_H 1
#cmakedefine HAVE_MACH_MACH_INIT_H 1
#cmakedefine HAVE_MACH_TASK_H 1
#cmakedefine HAVE_MACH_O_DYLD_H 1
#cmakedefine HAVE_NETDB_H 1
-#cmakedefine HAVE_NETINET_IN_H 1
#cmakedefine HAVE_POLL_H 1
#cmakedefine HAVE_PROCFS_H 1
#cmakedefine HAVE_PWD_H 1
@@ -102,7 +98,6 @@
#cmakedefine HAVE_STROPTS_H 1
#cmakedefine HAVE_SYS_FILE_H 1
#cmakedefine HAVE_SYS_IOCTL_H 1
-#cmakedefine HAVE_SYS_SYSCTL_H 1
#cmakedefine HAVE_SYS_MMAN_H 1
#cmakedefine HAVE_SYS_PARAM_H 1
#cmakedefine HAVE_SYS_RANDOM_H 1
@@ -111,7 +106,6 @@
#cmakedefine HAVE_SYS_TIMES_H 1
#cmakedefine HAVE_SYS_UIO_H 1
#cmakedefine HAVE_SYS_UN_H 1
-#cmakedefine HAVE_SYS_WAIT_H 1
#cmakedefine HAVE_TERMIOS_H 1
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_WINSOCK_H 1
@@ -157,24 +151,17 @@
#cmakedefine HAVE_POSIX_FADVISE 1
#cmakedefine HAVE_POSIX_FALLOCATE 1
#cmakedefine HAVE_POSIX_MADVISE 1
-#cmakedefine HAVE_PUTENV 1
#cmakedefine HAVE_SETTHREADDESCRIPTION 1
#cmakedefine HAVE_SETSID 1
#cmakedefine HAVE_SHUTDOWN 1
#cmakedefine HAVE_SIGACTION 1
#cmakedefine HAVE_SIGLONGJMP 1
-#cmakedefine HAVE_STPCPY 1
-#cmakedefine HAVE_STRCASESTR 1
-#cmakedefine HAVE_STRNCASECMP 1
#cmakedefine HAVE_STRPTIME 1
-#cmakedefine HAVE_STRSIGNAL 1
#cmakedefine HAVE_SYSCONF 1
#cmakedefine HAVE_TASK_INFO 1
#cmakedefine HAVE_TIMES 1
#cmakedefine HAVE_TM_GMTOFF 1
#cmakedefine HAVE_UNAME 1
-#cmakedefine HAVE_WCWIDTH 1
-// #cmakedefine HAVE_SEMTIMEDOP
#cmakedefine HAVE_PTHREAD_KILL 1
#cmakedefine HAVE_PTHREAD_SETNAME_NP 1
#cmakedefine HAVE_PTHREAD_SIGMASK 1
@@ -387,7 +374,6 @@ typedef __uint128_t uhge;
#endif
/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
#ifndef strncasecmp
#define strncasecmp(x,y,z) _strnicmp(x,y,z)
#endif
diff --git a/sql/backends/monet5/UDF/pyapi3/undef.h
b/sql/backends/monet5/UDF/pyapi3/undef.h
--- a/sql/backends/monet5/UDF/pyapi3/undef.h
+++ b/sql/backends/monet5/UDF/pyapi3/undef.h
@@ -20,12 +20,10 @@
#ifdef WIN32
-#undef HAVE_IO_H
#undef PREFIX
#undef EXEC_PREFIX
#undef SIZEOF_VOID_P
#undef SIZEOF_SIZE_T
-#undef HAVE_PUTENV
#undef HAVE_FTIME
#undef snprintf
#undef vsnprintf
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -24,10 +24,6 @@
#include "msabaoth.h"
#include "mutils.h"
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-
#ifndef HAVE_GETOPT_LONG
# include "monet_getopt.h"
#else
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
