From 6db59302d07f985b9e50f8bd01a1cb7db807bd67 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 8 Oct 2014 16:34:06 -0400 Subject: [PATCH] curl: Remove unused SIZEOF_LONG_DOUBLE Re-apply change from commit v2.8.2~537 (cmcurl: Remove unused SIZEOF_LONG_DOUBLE, 2009-12-17) on updated upstream curl. --- Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake | 3 --- Utilities/cmcurl/CMakeLists.txt | 1 - Utilities/cmcurl/lib/mprintf.c | 4 ---- 3 files changed, 8 deletions(-) diff --git a/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake b/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake index 3533a5413..0e26a173f 100644 --- a/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake +++ b/Utilities/cmcurl/CMake/Platforms/WindowsCache.cmake @@ -50,9 +50,6 @@ if(NOT UNIX) set(HAVE_X509_H 0) set(HAVE_ZLIB_H 0) - set(HAVE_SIZEOF_LONG_DOUBLE 1) - set(SIZEOF_LONG_DOUBLE 8) - set(HAVE_SOCKET 1) set(HAVE_POLL 0) set(HAVE_SELECT 1) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 845c330fe..0cd4f3a78 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -512,7 +512,6 @@ check_type_size("long" SIZEOF_LONG) check_type_size("short" SIZEOF_SHORT) check_type_size("int" SIZEOF_INT) check_type_size("__int64" SIZEOF___INT64) -check_type_size("long double" SIZEOF_LONG_DOUBLE) check_type_size("time_t" SIZEOF_TIME_T) if(NOT HAVE_SIZEOF_SSIZE_T) if(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) diff --git a/Utilities/cmcurl/lib/mprintf.c b/Utilities/cmcurl/lib/mprintf.c index 23070a764..7412dc38b 100644 --- a/Utilities/cmcurl/lib/mprintf.c +++ b/Utilities/cmcurl/lib/mprintf.c @@ -47,10 +47,6 @@ /* The last #include file should be: */ #include "memdebug.h" -#ifndef SIZEOF_LONG_DOUBLE -#define SIZEOF_LONG_DOUBLE 0 -#endif - /* * If SIZEOF_SIZE_T has not been defined, default to the size of long. */