Changeset: b6a4ae0fd263 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6a4ae0fd263 Modified Files: monetdb_config.h.in monetdb_config_win32.h.in Branch: default Log Message:
more cmakedefine cleanups diffs (truncated from 431 to 300 lines): diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -27,99 +27,99 @@ #include <assert.h> // Section: monetdb configure defines -#cmakedefine HAVE_DISPATCH_DISPATCH_H @HAVE_DISPATCH_DISPATCH_H@ -#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ -#cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@ -#cmakedefine HAVE_ICONV_H @HAVE_ICONV_H@ -#cmakedefine HAVE_IO_H @HAVE_IO_H@ -#cmakedefine HAVE_KVM_H @KVM_FOUND@ -#cmakedefine HAVE_LANGINFO_H @HAVE_LANGINFO_H@ -#cmakedefine HAVE_LIBGEN_H @HAVE_LIBGEN_H@ -#cmakedefine HAVE_LIBINTL_H @HAVE_LIBINTL_H@ -#cmakedefine HAVE_MACH_MACH_INIT_H @HAVE_MACH_MACH_INIT_H@ -#cmakedefine HAVE_MACH_TASK_H @HAVE_MACH_TASK_H@ -#cmakedefine HAVE_MACH_O_DYLD_H @HAVE_MACH_O_DYLD_H@ -#cmakedefine HAVE_NETDB_H @HAVE_NETDB_H@ -#cmakedefine HAVE_NETINET_IN_H @HAVE_NETINET_IN_H@ -#cmakedefine HAVE_POLL_H @HAVE_POLL_H@ -#cmakedefine HAVE_PROCFS_H @HAVE_PROCFS_H@ -#cmakedefine HAVE_PWD_H @HAVE_PWD_H@ -#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ -#cmakedefine HAVE_STROPTS_H @HAVE_STROPTS_H@ -#cmakedefine HAVE_SYS_FILE_H @HAVE_SYS_FILE_H@ -#cmakedefine HAVE_SYS_IOCTL_H @HAVE_SYS_IOCTL_H@ -#cmakedefine HAVE_SYS_SYSCTL_H @HAVE_SYS_SYSCTL_H@ -#cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ -#cmakedefine HAVE_SYS_PARAM_H @HAVE_SYS_PARAM_H@ -#cmakedefine HAVE_SYS_RESOURCE_H @HAVE_SYS_RESOURCE_H@ -#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ -#cmakedefine HAVE_SYS_TIMES_H @HAVE_SYS_TIMES_H@ -#cmakedefine HAVE_SYS_UIO_H @HAVE_SYS_UIO_H@ -#cmakedefine HAVE_SYS_UN_H @HAVE_SYS_UN_H@ -#cmakedefine HAVE_SYS_UTIME_H @HAVE_SYS_UTIME_H@ -#cmakedefine HAVE_SYS_WAIT_H @HAVE_SYS_WAIT_H@ -#cmakedefine HAVE_TERMIOS_H @HAVE_TERMIOS_H@ +#cmakedefine HAVE_DISPATCH_DISPATCH_H 1 +#cmakedefine HAVE_DLFCN_H 1 +#cmakedefine HAVE_FCNTL_H 1 +#cmakedefine HAVE_ICONV_H 1 +#cmakedefine HAVE_IO_H 1 +#cmakedefine HAVE_KVM_H 1 +#cmakedefine HAVE_LANGINFO_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 +#cmakedefine HAVE_STRINGS_H 1 +#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_RESOURCE_H 1 +#cmakedefine HAVE_SYS_TIME_H 1 +#cmakedefine HAVE_SYS_TIMES_H 1 +#cmakedefine HAVE_SYS_UIO_H 1 +#cmakedefine HAVE_SYS_UN_H 1 +#cmakedefine HAVE_SYS_UTIME_H 1 +#cmakedefine HAVE_SYS_WAIT_H 1 +#cmakedefine HAVE_TERMIOS_H 1 #cmakedefine HAVE_UNISTD_H 1 -#cmakedefine HAVE_UUID_UUID_H @HAVE_UUID_UUID_H@ -#cmakedefine HAVE_WINSOCK_H @HAVE_WINSOCK_H@ -#cmakedefine HAVE_SEMAPHORE_H @HAVE_SEMAPHORE_H@ -#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ +#cmakedefine HAVE_UUID_UUID_H 1 +#cmakedefine HAVE_WINSOCK_H 1 +#cmakedefine HAVE_SEMAPHORE_H 1 +#cmakedefine HAVE_GETOPT_H 1 -#cmakedefine HAVE_STDATOMIC_H @HAVE_STDATOMIC_H@ +#cmakedefine HAVE_STDATOMIC_H 1 -#cmakedefine HAVE_DIRENT_H @HAVE_DIRENT_H@ -#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ -#cmakedefine HAVE_GETTIMEOFDAY @HAVE_SYS_TIME_H@ -#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ -#cmakedefine HAVE_FDATASYNC @HAVE_FDATASYNC@ -#cmakedefine HAVE_ACCEPT4 @HAVE_ACCEPT4@ -#cmakedefine HAVE_ASCTIME_R @HAVE_ASCTIME_R@ -#cmakedefine HAVE_CLOCK_GETTIME @HAVE_CLOCK_GETTIME@ -#cmakedefine HAVE_CTIME_R @HAVE_CTIME_R@ -#cmakedefine HAVE_DISPATCH_SEMAPHORE_CREATE @HAVE_DISPATCH_SEMAPHORE_CREATE@ -#cmakedefine HAVE_FALLOCATE @HAVE_FALLOCATE@ -#cmakedefine HAVE_FCNTL @HAVE_FCNTL@ -#cmakedefine HAVE_FORK @HAVE_FORK@ -#cmakedefine HAVE_FSYNC @HAVE_FSYNC@ -#cmakedefine HAVE_FTIME @HAVE_FTIME@ -#cmakedefine HAVE_GETEXECNAME @HAVE_GETEXECNAME@ -#cmakedefine HAVE_GETLOGIN @HAVE_GETLOGIN@ -#cmakedefine HAVE_GETOPT_LONG @HAVE_GETOPT_LONG@ -#cmakedefine HAVE_GETRLIMIT @HAVE_GETRLIMIT@ -#cmakedefine HAVE_GETTIMEOFDAY @HAVE_GETTIMEOFDAY@ -#cmakedefine HAVE_GETUID @HAVE_GETUID@ -#cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@ -#cmakedefine HAVE_LOCALTIME_R @HAVE_LOCALTIME_R@ -#cmakedefine HAVE_STRERROR_R @HAVE_STRERROR_R@ -#cmakedefine HAVE_LOCKF @HAVE_LOCKF@ -#cmakedefine HAVE_MADVISE @HAVE_MADVISE@ -#cmakedefine HAVE_MREMAP @HAVE_MREMAP@ -#cmakedefine HAVE_NANOSLEEP @HAVE_NANOSLEEP@ -#cmakedefine HAVE_NL_LANGINFO @HAVE_NL_LANGINFO@ -#cmakedefine HAVE__NSGETEXECUTABLEPATH @HAVE__NSGETEXECUTABLEPATH@ -#cmakedefine HAVE_PIPE2 @HAVE_PIPE2@ -#cmakedefine HAVE_POLL @HAVE_POLL@ -#cmakedefine HAVE_POPEN @HAVE_POPEN@ -#cmakedefine HAVE_POSIX_FADVISE @HAVE_POSIX_FADVISE@ -#cmakedefine HAVE_POSIX_FALLOCATE @HAVE_POSIX_FALLOCATE@ -#cmakedefine HAVE_POSIX_MADVISE @HAVE_POSIX_MADVISE@ -#cmakedefine HAVE_PUTENV @HAVE_PUTENV@ -#cmakedefine HAVE_SETSID @HAVE_SETSID@ -#cmakedefine HAVE_SHUTDOWN @HAVE_SHUTDOWN@ -#cmakedefine HAVE_SIGACTION @HAVE_SIGACTION@ -#cmakedefine HAVE_STPCPY @HAVE_STPCPY@ -#cmakedefine HAVE_STRCASESTR @HAVE_STRCASESTR@ -#cmakedefine HAVE_STRNCASECMP @HAVE_STRNCASECMP@ -#cmakedefine HAVE_STRPTIME @HAVE_STRPTIME@ -#cmakedefine HAVE_STRSIGNAL @HAVE_STRSIGNAL@ -#cmakedefine HAVE_SYSCONF @HAVE_SYSCONF@ -#cmakedefine HAVE_TASK_INFO @HAVE_TASK_INFO@ -#cmakedefine HAVE_TIMES @HAVE_TIMES@ -#cmakedefine HAVE_UNAME @HAVE_UNAME@ +#cmakedefine HAVE_DIRENT_H 1 +#cmakedefine HAVE_SYS_SOCKET_H 1 +#cmakedefine HAVE_GETTIMEOFDAY 1 +#cmakedefine HAVE_SYS_STAT_H 1 +#cmakedefine HAVE_FDATASYNC 1 +#cmakedefine HAVE_ACCEPT4 1 +#cmakedefine HAVE_ASCTIME_R 1 +#cmakedefine HAVE_CLOCK_GETTIME 1 +#cmakedefine HAVE_CTIME_R 1 +#cmakedefine HAVE_DISPATCH_SEMAPHORE_CREATE 1 +#cmakedefine HAVE_FALLOCATE 1 +#cmakedefine HAVE_FCNTL 1 +#cmakedefine HAVE_FORK 1 +#cmakedefine HAVE_FSYNC 1 +#cmakedefine HAVE_FTIME 1 +#cmakedefine HAVE_GETEXECNAME 1 +#cmakedefine HAVE_GETLOGIN 1 +#cmakedefine HAVE_GETOPT_LONG 1 +#cmakedefine HAVE_GETRLIMIT 1 +#cmakedefine HAVE_GETTIMEOFDAY 1 +#cmakedefine HAVE_GETUID 1 +#cmakedefine HAVE_GMTIME_R 1 +#cmakedefine HAVE_LOCALTIME_R 1 +#cmakedefine HAVE_STRERROR_R 1 +#cmakedefine HAVE_LOCKF 1 +#cmakedefine HAVE_MADVISE 1 +#cmakedefine HAVE_MREMAP 1 +#cmakedefine HAVE_NANOSLEEP 1 +#cmakedefine HAVE_NL_LANGINFO 1 +#cmakedefine HAVE__NSGETEXECUTABLEPATH 1 +#cmakedefine HAVE_PIPE2 1 +#cmakedefine HAVE_POLL 1 +#cmakedefine HAVE_POPEN 1 +#cmakedefine HAVE_POSIX_FADVISE 1 +#cmakedefine HAVE_POSIX_FALLOCATE 1 +#cmakedefine HAVE_POSIX_MADVISE 1 +#cmakedefine HAVE_PUTENV 1 +#cmakedefine HAVE_SETSID 1 +#cmakedefine HAVE_SHUTDOWN 1 +#cmakedefine HAVE_SIGACTION 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_UNAME 1 // #cmakedefine HAVE_SEMTIMEDOP -#cmakedefine HAVE_PTHREAD_KILL @HAVE_PTHREAD_KILL@ -#cmakedefine HAVE_PTHREAD_SIGMASK @HAVE_PTHREAD_SIGMASK@ -#cmakedefine HAVE_GETOPT @HAVE_GETOPT@ +#cmakedefine HAVE_PTHREAD_KILL 1 +#cmakedefine HAVE_PTHREAD_SIGMASK 1 +#cmakedefine HAVE_GETOPT 1 #define ICONV_CONST #define FLEXIBLE_ARRAY_MEMBER @@ -129,33 +129,33 @@ // End Section: monetdb configure defines // Section: monetdb macro variables -#cmakedefine HAVE_ICONV @HAVE_ICONV@ -#cmakedefine HAVE_PTHREAD_H @HAVE_PTHREAD_H@ -#cmakedefine HAVE_LIBPCRE @HAVE_LIBPCRE@ -#cmakedefine HAVE_OPENSSL @HAVE_OPENSSL@ -#cmakedefine HAVE_COMMONCRYPTO @HAVE_COMMONCRYPTO@ -#cmakedefine HAVE_LIBBZ2 @HAVE_LIBBZ2@ -#cmakedefine HAVE_CURL @HAVE_CURL@ -#cmakedefine HAVE_LIBLZMA @HAVE_LIBLZMA@ -#cmakedefine HAVE_LIBXML @HAVE_LIBXML@ -#cmakedefine HAVE_LIBZ @HAVE_LIBZ@ -#cmakedefine HAVE_LIBLZ4 @HAVE_LIBLZ4@ -#cmakedefine HAVE_PROJ @HAVE_PROJ@ -#cmakedefine HAVE_SNAPPY @HAVE_SNAPPY@ -#cmakedefine HAVE_FITS @HAVE_FITS@ -#cmakedefine HAVE_UUID @HAVE_UUID@ -#cmakedefine HAVE_VALGRIND @HAVE_VALGRIND@ -#cmakedefine HAVE_NETCDF @HAVE_NETCDF@ -#cmakedefine HAVE_READLINE @HAVE_READLINE@ -#cmakedefine HAVE_LIBR @HAVE_LIBR@ +#cmakedefine HAVE_ICONV 1 +#cmakedefine HAVE_PTHREAD_H 1 +#cmakedefine HAVE_LIBPCRE 1 +#cmakedefine HAVE_OPENSSL 1 +#cmakedefine HAVE_COMMONCRYPTO 1 +#cmakedefine HAVE_LIBBZ2 1 +#cmakedefine HAVE_CURL 1 +#cmakedefine HAVE_LIBLZMA 1 +#cmakedefine HAVE_LIBXML 1 +#cmakedefine HAVE_LIBZ 1 +#cmakedefine HAVE_LIBLZ4 1 +#cmakedefine HAVE_PROJ 1 +#cmakedefine HAVE_SNAPPY 1 +#cmakedefine HAVE_FITS 1 +#cmakedefine HAVE_UUID 1 +#cmakedefine HAVE_VALGRIND 1 +#cmakedefine HAVE_NETCDF 1 +#cmakedefine HAVE_READLINE 1 +#cmakedefine HAVE_LIBR 1 #cmakedefine RHOME "@RHOME@" -#cmakedefine HAVE_GEOM @HAVE_GEOM@ -#cmakedefine HAVE_SHP @HAVE_SHP@ -#cmakedefine HAVE_LIBPY3 @HAVE_LIBPY3@ +#cmakedefine HAVE_GEOM 1 +#cmakedefine HAVE_SHP 1 +#cmakedefine HAVE_LIBPY3 1 // #cmakedefine SOCKET_LIBRARIES -#cmakedefine HAVE_GETADDRINFO @HAVE_GETADDRINFO@ -#cmakedefine HAVE_CUDF @HAVE_CUDF@ +#cmakedefine HAVE_GETADDRINFO 1 +#cmakedefine HAVE_CUDF 1 #cmakedefine DIR_SEP '@DIR_SEP@' #cmakedefine PATH_SEP '@PATH_SEP@' @@ -199,13 +199,13 @@ /* The used password hash algorithm */ #define MONETDB5_PASSWDHASH_TOKEN @PASSWORD_BACKEND@ -#cmakedefine HAVE_MD5_UPDATE @HAVE_MD5_UPDATE@ -#cmakedefine HAVE_RIPEMD160_UPDATE @HAVE_RIPEMD160_UPDATE@ -#cmakedefine HAVE_SHA1_UPDATE @HAVE_SHA1_UPDATE@ -#cmakedefine HAVE_SHA224_UPDATE @HAVE_SHA224_UPDATE@ -#cmakedefine HAVE_SHA256_UPDATE @HAVE_SHA256_UPDATE@ -#cmakedefine HAVE_SHA384_UPDATE @HAVE_SHA384_UPDATE@ -#cmakedefine HAVE_SHA512_UPDATE @HAVE_SHA512_UPDATE@ +#cmakedefine HAVE_MD5_UPDATE 1 +#cmakedefine HAVE_RIPEMD160_UPDATE 1 +#cmakedefine HAVE_SHA1_UPDATE 1 +#cmakedefine HAVE_SHA224_UPDATE 1 +#cmakedefine HAVE_SHA256_UPDATE 1 +#cmakedefine HAVE_SHA384_UPDATE 1 +#cmakedefine HAVE_SHA512_UPDATE 1 #ifndef _Noreturn #cmakedefine _Noreturn @_Noreturn@ @@ -272,7 +272,7 @@ typedef __uint128_t uhge; #define static_assert(expr, mesg) ((void) 0) #endif -#cmakedefine HAVE_SOCKLEN_T @HAVE_SOCKLEN_T@ +#cmakedefine HAVE_SOCKLEN_T 1 #ifndef SOCKET #define SOCKET int #endif diff --git a/monetdb_config_win32.h.in b/monetdb_config_win32.h.in --- a/monetdb_config_win32.h.in +++ b/monetdb_config_win32.h.in @@ -124,35 +124,35 @@ stpcpy(char *restrict dst, const char *r #endif /* _MSC_VER */ // Section: monetdb configure defines -#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ -#cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@ -#cmakedefine HAVE_ICONV_H @HAVE_ICONV_H@ -#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ -#cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ -#cmakedefine HAVE_SYS_UN_H @HAVE_SYS_UN_H@ -#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ -#cmakedefine HAVE_UUID_UUID_H @HAVE_UUID_UUID_H@ -#cmakedefine HAVE_WINSOCK_H @HAVE_WINSOCK_H@ -#cmakedefine HAVE_SEMAPHORE_H @HAVE_SEMAPHORE_H@ -#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ +#cmakedefine HAVE_DLFCN_H 1 +#cmakedefine HAVE_FCNTL_H 1 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
