Changeset: 94f01f2280ad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94f01f2280ad
Modified Files:
CMakeLists.txt
gdk/gdk_posix.c
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Removed Mac 0S X specific tests.
diffs (79 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1042,8 +1042,6 @@ check_include_file("getopt.h" HAVE_GETOP
check_include_file("io.h" HAVE_IO_H)
check_include_file("kvm.h" HAVE_KVM_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("netdb.h" HAVE_NETDB_H)
check_include_file("pthread.h" HAVE_PTHREAD_H)
check_include_file("semaphore.h" HAVE_SEMAPHORE_H)
@@ -1074,7 +1072,7 @@ check_type_size(SOCKET _SOCKET LANGUAGE
if(NOT HAVE__SOCKET)
set(SOCKET int)
endif()
-check_type_size(size_t SIZEOF_SIZE_T LANGUAGE C) #On C99
+check_type_size(size_t SIZEOF_SIZE_T LANGUAGE C) #On C99, but we have to
calculate the size
check_type_size(ssize_t SIZEOF_SSIZE_T LANGUAGE C)
if(NOT HAVE_SIZEOF_SSIZE_T AND MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) # Windows
64 bit
set(ssize_t "int64_t")
@@ -1137,7 +1135,6 @@ check_symbol_exists("strptime" "time.h"
check_symbol_exists("strtok_r" "string.h" HAVE_STRTOK_R)
check_symbol_exists("strtok_s" "string.h" HAVE_STRTOK_S)
check_symbol_exists("sysconf" "unistd.h" HAVE_SYSCONF)
-check_symbol_exists("task_info" "mach/task_info.h" HAVE_TASK_INFO)
check_symbol_exists("times" "sys/times.h" HAVE_TIMES)
check_symbol_exists("_wfopen_s" "wchar.h" HAVE__WFOPEN) # Check for _wfopen_s
to avoid warnings
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -30,10 +30,8 @@
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
-#ifdef HAVE_MACH_TASK_H
+#ifdef __MACH__
# include <mach/task.h>
-#endif
-#ifdef HAVE_MACH_MACH_INIT_H
# include <mach/mach_init.h>
#endif
#if defined(HAVE_KVM_H) && defined(HAVE_SYS_SYSCTL_H)
@@ -247,7 +245,7 @@ MT_init_posix(void)
size_t
MT_getrss(void)
{
-#if defined(HAVE_TASK_INFO)
+#if defined(__MACH__)
/* Darwin/MACH call for process' RSS */
task_t task = mach_task_self();
struct task_basic_info_64 t_info;
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -235,12 +235,6 @@
/* Define to 1 if you have the `localtime_s' function. */
#cmakedefine HAVE_LOCALTIME_S 1
-/* Define to 1 if you have the <mach/mach_init.h> header file. */
-#cmakedefine HAVE_MACH_MACH_INIT_H 1
-
-/* Define to 1 if you have the <mach/task.h> header file. */
-#cmakedefine HAVE_MACH_TASK_H 1
-
/* Define to 1 if you have the `madvise' function. */
#cmakedefine HAVE_MADVISE 1
@@ -388,9 +382,6 @@
/* Define to 1 if you have the <sys/un.h> header file. */
#cmakedefine HAVE_SYS_UN_H 1
-/* Define to 1 if you have the `task_info' function. */
-#cmakedefine HAVE_TASK_INFO 1
-
/* Define to 1 if you have the <termios.h> header file. */
#cmakedefine HAVE_TERMIOS_H 1
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
