From d85a7c675199fa776e3d4c21104b16274fccae77 Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Mon, 31 Jul 2017 18:45:32 +0200 Subject: [PATCH] Remove unused HAVE_SYS_TIME_H and TM_IN_SYS_TIME variables --- config/CMakeChecks.txt | 14 +------------- config/config.h.cmake | 6 ------ config/config.h.in | 6 ------ include/exiv2/exv_msvc.h | 6 ------ 4 files changed, 1 insertion(+), 31 deletions(-) diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt index 35b4e4b5..75c5d6ad 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -71,23 +71,12 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL ) # checking for Header files check_include_file( "inttypes.h" have_inttypes_h ) check_include_file( "wchar.h" HAVE_WCHAR_H ) -check_include_file( "sys/time.h" HAVE_SYS_TIME_H ) check_include_file( "sys/types.h" HAVE_SYS_TYPES_H ) check_include_file( "regex.h" HAVE_REGEX ) check_function_exists( timegm HAVE_TIMEGM ) check_function_exists( vprintf HAVE_VPRINTF ) -# struct tm in sys/time.h -IF( HAVE_SYS_TIME_H ) - CHECK_C_SOURCE_COMPILES( "#include -int main() { -struct tm t; -return 0; -}" TM_IN_SYS_TIME ) -ENDIF( HAVE_SYS_TIME_H ) - - # time.h and sys/time.h can be included in the same file CHECK_C_SOURCE_COMPILES( "#include #include @@ -100,8 +89,7 @@ IF( NOT MSVC ) SET( HAVE_PID_T TRUE ) ENDIF( NOT MSVC ) -SET( EXV_SYMBOLS HAVE_SYS_TIME_H - HAVE_SYS_TYPES_H +SET( EXV_SYMBOLS HAVE_SYS_TYPES_H HAVE_TIMEGM HAVE_VPRINTF HAVE_WCHAR_H diff --git a/config/config.h.cmake b/config/config.h.cmake index c19cfc26..61a8be46 100644 --- a/config/config.h.cmake +++ b/config/config.h.cmake @@ -101,9 +101,6 @@ // Definition to indicate if you have the header file. #cmakedefine EXV_HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#cmakedefine EXV_HAVE_SYS_TIME_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine EXV_HAVE_SYS_TYPES_H 1 @@ -160,9 +157,6 @@ /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 -/* Define to 1 if your declares `struct tm'. */ -#cmakedefine TM_IN_SYS_TIME 1 - /* Define to empty if `const' does not conform to ANSI C. */ #cmakedefine const diff --git a/config/config.h.in b/config/config.h.in index 6ade30c7..2fecef23 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -92,9 +92,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H @@ -156,9 +153,6 @@ /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h index a911704e..b985ffb6 100644 --- a/include/exiv2/exv_msvc.h +++ b/include/exiv2/exv_msvc.h @@ -101,9 +101,6 @@ /* Define to 1 if you have the header file. */ /* #undef EXV_HAVE_SYS_STAT_H */ -/* Define to 1 if you have the header file. */ -/* #undef EXV_HAVE_SYS_TIME_H */ - /* Define to 1 if you have the header file. */ /* #undef EXV_HAVE_SYS_TYPES_H */ @@ -159,9 +156,6 @@ /* Define to 1 if you can safely include both and . */ #define TIME_WITH_SYS_TIME 1 -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */