Changeset: 304ec4949a3f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=304ec4949a3f
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-fun
Log Message:
Simplify type checks.
diffs (61 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -452,22 +452,14 @@ check_include_file("sys/time.h" HAVE_SYS
# C types existence
cmake_push_check_state()
-if(MSVC)
- set(CMAKE_EXTRA_INCLUDE_FILES
"${CMAKE_EXTRA_INCLUDE_FILES};sys/types.h;winsock.h;crtdefs.h")
-else()
- set(CMAKE_EXTRA_INCLUDE_FILES
"${CMAKE_EXTRA_INCLUDE_FILES};sys/types.h;sys/socket.h")
-endif()
-check_type_size(SOCKET _SOCKET LANGUAGE C)
-if(NOT HAVE__SOCKET)
- set(SOCKET int)
-endif()
+set(CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};sys/types.h")
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")
set(SIZEOF_SSIZE_T 8)
elseif(MSVC)
- set(ssize_t "int")
+ set(ssize_t "int32_t")
set(SIZEOF_SSIZE_T 4)
endif()
check_type_size(char SIZEOF_CHAR LANGUAGE C)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -457,11 +457,6 @@
#cmakedefine restrict @restrict@
#endif
-/* type used for sockets */
-#ifndef SOCKET
-#cmakedefine SOCKET @SOCKET@
-#endif
-
/* Define to `int' if <sys/types.h> does not define. */
#ifndef ssize_t
#cmakedefine ssize_t @ssize_t@
@@ -506,12 +501,13 @@ typedef __uint128_t uhge;
#define SIZEOF_HGE SIZEOF___INT128_T
#endif
-#if !defined(NATIVE_WIN32) && !defined(closesocket)
-/* on Windows use closesocket, otherwise just close */
+#ifndef WIN32
+#ifndef SOCKET
+#define SOCKET int32_t
+#endif
+#ifndef closesocket
#define closesocket close
#endif
-
-#ifndef WIN32
#ifndef _In_z_
#define _In_z_
#endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
