From 9e573276c464f026f79b16cb47a6593e07507225 Mon Sep 17 00:00:00 2001 From: malaterre Date: Sun, 29 May 2005 23:10:23 +0000 Subject: [PATCH] ENH: Minor cleanup --- src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt | 6 +++--- .../src/libjasper/include/jasper/jas_config.h.in | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt index 7a79978a..fd1ba789 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt +++ b/src/gdcmjasper/src/libjasper/include/jasper/CMakeLists.txt @@ -72,7 +72,7 @@ IF(GDCM_SIZEOF___INT64) MESSAGE(STATUS "Checking whether long and __int64 are the same type") TRY_COMPILE(GDCM_TYPE_SAME_LONG_AND___INT64 ${GDCM_BINARY_DIR}/CMakeTmp - ${GDCM_SOURCE_DIR}/CMake/vtkTestCompareTypes.cxx + ${GDCM_SOURCE_DIR}/CMake/gdcmTestCompareTypes.cxx COMPILE_DEFINITIONS -DGDCM_TEST_COMPARE_TYPE_1=long -DGDCM_TEST_COMPARE_TYPE_2=__int64 @@ -98,7 +98,7 @@ IF(GDCM_SIZEOF___INT64) MESSAGE(STATUS "Checking whether long long and __int64 are the same type") TRY_COMPILE(GDCM_TYPE_SAME_LONG_LONG_AND___INT64 ${GDCM_BINARY_DIR}/CMakeTmp - ${GDCM_SOURCE_DIR}/CMake/vtkTestCompareTypes.cxx + ${GDCM_SOURCE_DIR}/CMake/gdcmTestCompareTypes.cxx COMPILE_DEFINITIONS -DGDCM_TEST_COMPARE_TYPE_1=TYPE_LONG_LONG -DGDCM_TEST_COMPARE_TYPE_2=__int64 @@ -128,7 +128,7 @@ IF(GDCM_SIZEOF___INT64) MESSAGE(STATUS "Checking whether unsigned __int64 can convert to double") TRY_COMPILE(GDCM_TYPE_CONVERT_UI64_TO_DOUBLE ${GDCM_BINARY_DIR}/CMakeTmp - ${GDCM_SOURCE_DIR}/CMake/vtkTestConvertTypes.cxx + ${GDCM_SOURCE_DIR}/CMake/gdcmTestConvertTypes.cxx COMPILE_DEFINITIONS -DGDCM_TEST_CONVERT_TYPE_FROM=TYPE_UNSIGNED___INT64 -DGDCM_TEST_CONVERT_TYPE_TO=double diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in index 055fc02c..e5c2efa7 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in @@ -142,6 +142,7 @@ +#if 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 #endif @@ -186,7 +187,7 @@ typedef unsigned __int64 ulonglong; typedef __int64 longlong; #else #error this is not supposed to happen please report your compiler -#endif +#endif //GDCM_TYPE_USE___INT64 #else #ifdef GDCM_TYPE_USE_LONG_LONG typedef unsigned char uchar; @@ -194,9 +195,9 @@ typedef unsigned long long ulonglong; typedef long long longlong; #else #error this is not supposed to happen please report your compiler -#endif +#endif // GDCM_TYPE_USE_LONG_LONG /* #define ssize_t int */ -#endif +#endif // HAVE_SYS_TYPES_H #endif -- 2.45.1