[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 26/256: cmake: sizeof curl_off_t, remove unused det
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 26/256: cmake: sizeof curl_off_t, remove unused detections |
Date: |
Fri, 06 Oct 2017 19:41:57 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 1286b7c09e86bb59d31b2fc056a47d247c43be09
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sat Aug 12 15:54:06 2017 +0200
cmake: sizeof curl_off_t, remove unused detections
---
CMakeLists.txt | 51 +++++++------------------------------------------
lib/curl_config.h.cmake | 3 +++
2 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3bfd8e9c..e70afd6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -799,50 +799,6 @@ if(NOT HAVE_SIZEOF_SSIZE_T)
endif(NOT HAVE_SIZEOF_SSIZE_T)
# off_t is sized later, after the HAVE_FILE_OFFSET_BITS test
-# Different sizeofs, etc.
-
-# define CURL_SIZEOF_LONG 4
-# define CURL_TYPEOF_CURL_OFF_T long long
-# define CURL_FORMAT_CURL_OFF_T "lld"
-# define CURL_FORMAT_CURL_OFF_TU "llu"
-# define CURL_FORMAT_OFF_T "%lld"
-# define CURL_SIZEOF_CURL_OFF_T 8
-# define CURL_SUFFIX_CURL_OFF_T LL
-# define CURL_SUFFIX_CURL_OFF_TU ULL
-
-set(CURL_SIZEOF_LONG ${SIZEOF_LONG})
-
-if(SIZEOF_LONG EQUAL 8)
- set(CURL_TYPEOF_CURL_OFF_T long)
- set(CURL_SIZEOF_CURL_OFF_T 8)
- set(CURL_FORMAT_CURL_OFF_T "ld")
- set(CURL_FORMAT_CURL_OFF_TU "lu")
- set(CURL_FORMAT_OFF_T "%ld")
- set(CURL_SUFFIX_CURL_OFF_T L)
- set(CURL_SUFFIX_CURL_OFF_TU UL)
-endif(SIZEOF_LONG EQUAL 8)
-
-if(SIZEOF_LONG_LONG EQUAL 8)
- set(CURL_TYPEOF_CURL_OFF_T "long long")
- set(CURL_SIZEOF_CURL_OFF_T 8)
- set(CURL_FORMAT_CURL_OFF_T "lld")
- set(CURL_FORMAT_CURL_OFF_TU "llu")
- set(CURL_FORMAT_OFF_T "%lld")
- set(CURL_SUFFIX_CURL_OFF_T LL)
- set(CURL_SUFFIX_CURL_OFF_TU ULL)
-endif(SIZEOF_LONG_LONG EQUAL 8)
-
-if(NOT CURL_TYPEOF_CURL_OFF_T)
- set(CURL_TYPEOF_CURL_OFF_T ${ssize_t})
- set(CURL_SIZEOF_CURL_OFF_T ${SIZEOF_SSIZE_T})
- # TODO: need adjustment here.
- set(CURL_FORMAT_CURL_OFF_T "ld")
- set(CURL_FORMAT_CURL_OFF_TU "lu")
- set(CURL_FORMAT_OFF_T "%ld")
- set(CURL_SUFFIX_CURL_OFF_T L)
- set(CURL_SUFFIX_CURL_OFF_TU LU)
-endif(NOT CURL_TYPEOF_CURL_OFF_T)
-
if(HAVE_SIZEOF_LONG_LONG)
set(HAVE_LONGLONG 1)
set(HAVE_LL 1)
@@ -1011,6 +967,13 @@ if(HAVE_FILE_OFFSET_BITS)
set(CMAKE_REQUIRED_FLAGS "-D_FILE_OFFSET_BITS=64")
endif(HAVE_FILE_OFFSET_BITS)
check_type_size("off_t" SIZEOF_OFF_T)
+
+# include this header to get the type
+set(CMAKE_REQUIRED_INCLUDES "${CURL_SOURCE_DIR}/include")
+set(CMAKE_EXTRA_INCLUDE_FILES "curl/system.h")
+check_type_size("curl_off_t" SIZEOF_CURL_OFF_T)
+set(CMAKE_EXTRA_INCLUDE_FILES "")
+
set(CMAKE_REQUIRED_FLAGS)
foreach(CURL_TEST
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index c2b5bacb9..c80484f65 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -888,6 +888,9 @@
/* The size of `off_t', as computed by sizeof. */
#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T}
+/* The size of `curl_off_t', as computed by sizeof. */
+#cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T}
+
/* The size of `size_t', as computed by sizeof. */
#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 50/256: config-tpf: define SIZEOF_LONG, (continued)
- [GNUnet-SVN] [gnurl] 50/256: config-tpf: define SIZEOF_LONG, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 23/256: CURLOPT_SSH_COMPRESSION.3: enable with 1L, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 27/256: config-win32: define SIZEOF_CURL_OFF_T, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 16/256: travis: add metalink to some osx builds, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 10/256: progress: Track total times following redirects, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 22/256: compressed-ssh.d: "Added: 7.56.0", gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 52/256: CURLOPT_USERPWD.3: see also CURLOPT_PROXYUSERPWD, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 15/256: coverage: Use two coveralls commands to get lib/vtls results, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 31/256: http: Don't wait on CONNECT when there is no proxy, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 24/256: ftp: fix CWD when doing multicwd then nocwd on same connection, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 26/256: cmake: sizeof curl_off_t, remove unused detections,
gnunet <=
- [GNUnet-SVN] [gnurl] 28/256: lib557: no longer use CURL_SIZEOF_* defines, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 51/256: imap: support PREAUTH, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 32/256: curl/system.h: check for __ppc__ as well, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 34/256: http2_recv: return error better on fatal h2 errors, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 39/256: runtests: fixed case insensitive matching of keywords, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 41/256: curl/system.h: fix build for hppa, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 38/256: tests: Make sure libtests call curl_global_cleanup(), gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 53/256: imap: use defined names for response codes, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 33/256: KNOWN_BUGS: HTTP test server 'connection-monitor' problems, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 58/256: system.h: include sys/poll.h for AIX, gnunet, 2017/10/06