diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ba5b62d2bb4c9d6c37eb92784d6d86bb928465c..40c6f52d3cbeb08c2bd2e2fd095f4868933f71c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -342,8 +342,6 @@ ENDIF() # capabilities and parent project's request. Enforce 0/1 as only # possible values for configuration into Configure.hxx. -KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_CSTDDEF - "Checking whether header cstddef is available" DIRECT) KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS "Checking whether \"<>\" is needed for template friends" INVERT) KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_MEMBER_TEMPLATES @@ -730,17 +728,6 @@ IF(KWSYS_INSTALL_DOC_DIR) ${KWSYS_INSTALL_LICENSE_OPTIONS}) ENDIF() -#----------------------------------------------------------------------------- -# Provide cstddef header. -CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/kwsys_cstddef.hxx.in - ${KWSYS_HEADER_DIR}/cstddef - @ONLY IMMEDIATE) -IF(KWSYS_INSTALL_INCLUDE_DIR) - INSTALL(FILES ${KWSYS_HEADER_DIR}/cstddef - DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE} - ${KWSYS_INSTALL_INCLUDE_OPTIONS}) -ENDIF() - #----------------------------------------------------------------------------- # Build a list of classes and headers we need to implement the # selected components. Initialize with required components. diff --git a/Configure.hxx.in b/Configure.hxx.in index e980db79d40d39d330950ef53e7a2ae21578920d..16c3282c8237f93d7838d0995ae32b19a28143af 100644 --- a/Configure.hxx.in +++ b/Configure.hxx.in @@ -18,9 +18,6 @@ /* Whether wstring is available. */ #define @KWSYS_NAMESPACE@_STL_HAS_WSTRING @KWSYS_STL_HAS_WSTRING@ -/* Whether the cstddef header is available. */ -#define @KWSYS_NAMESPACE@_CXX_HAS_CSTDDEF @KWSYS_CXX_HAS_CSTDDEF@ - /* Whether the compiler supports null template arguments. */ #define @KWSYS_NAMESPACE@_CXX_HAS_NULL_TEMPLATE_ARGS @KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS@ @@ -65,7 +62,6 @@ # endif # define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS # define KWSYS_STAT_HAS_ST_MTIM @KWSYS_NAMESPACE@_STAT_HAS_ST_MTIM -# define KWSYS_CXX_HAS_CSTDDEF @KWSYS_NAMESPACE@_CXX_HAS_CSTDDEF # define KWSYS_CXX_NULL_TEMPLATE_ARGS @KWSYS_NAMESPACE@_CXX_NULL_TEMPLATE_ARGS # define KWSYS_CXX_HAS_MEMBER_TEMPLATES @KWSYS_NAMESPACE@_CXX_HAS_MEMBER_TEMPLATES # define KWSYS_CXX_HAS_FULL_SPECIALIZATION @KWSYS_NAMESPACE@_CXX_HAS_FULL_SPECIALIZATION diff --git a/hash_fun.hxx.in b/hash_fun.hxx.in index ed758048f93299dd0aa5a13e9a925d6345378d8e..489b9c94b9fc2fffeca9eafe75071f60b9fd7594 100644 --- a/hash_fun.hxx.in +++ b/hash_fun.hxx.in @@ -38,7 +38,7 @@ #define @KWSYS_NAMESPACE@_hash_fun_hxx #include <@KWSYS_NAMESPACE@/Configure.hxx> -#include <@KWSYS_NAMESPACE@/cstddef> // size_t +#include <stddef.h> // size_t #include <string> namespace @KWSYS_NAMESPACE@ diff --git a/hashtable.hxx.in b/hashtable.hxx.in index 51f9c9e7ccc06672584fe758055a11bcced47bb8..97537ceae5830800006a473718b90e023a1f23a4 100644 --- a/hashtable.hxx.in +++ b/hashtable.hxx.in @@ -44,7 +44,7 @@ #include <@KWSYS_NAMESPACE@/Configure.hxx> -#include <@KWSYS_NAMESPACE@/cstddef> // size_t +#include <stddef.h> // size_t #include <algorithm> // lower_bound #include <functional> // unary_function #include <iterator> // iterator_traits diff --git a/kwsysPlatformTestsCXX.cxx b/kwsysPlatformTestsCXX.cxx index ac6b453b0d4a60513bac23c88d211dff9d2137db..857ec4111625a6fac5554a304b16f00fc6b770f7 100644 --- a/kwsysPlatformTestsCXX.cxx +++ b/kwsysPlatformTestsCXX.cxx @@ -14,12 +14,6 @@ int main() { return 0; } #endif -#ifdef TEST_KWSYS_CXX_HAS_CSTDDEF -#include <cstddef> -void f(size_t) {} -int main() { return 0; } -#endif - #ifdef TEST_KWSYS_CXX_HAS_LONG_LONG long long f(long long n) { return n; } int main() diff --git a/kwsys_cstddef.hxx.in b/kwsys_cstddef.hxx.in deleted file mode 100644 index 925c030846388badcb8b1cbb3a0efa27b1ce9f77..0000000000000000000000000000000000000000 --- a/kwsys_cstddef.hxx.in +++ /dev/null @@ -1,35 +0,0 @@ -/*============================================================================ - KWSys - Kitware System Library - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ -#ifndef @KWSYS_NAMESPACE@_cstddef -#define @KWSYS_NAMESPACE@_cstddef - -#include <@KWSYS_NAMESPACE@/Configure.hxx> - -/* Avoid warnings in MSVC standard headers. */ -#ifdef _MSC_VER -# pragma warning (push, 1) -# pragma warning (disable: 4702) -# pragma warning (disable: 4786) -#endif - -/* Include the real header. */ -#if @KWSYS_NAMESPACE@_CXX_HAS_CSTDDEF -# include <cstddef> -#else -# include <stddef.h> -#endif - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -#endif