diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt index 5ff961a6..ed3af731 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -72,7 +72,6 @@ ENDIF( EXIV2_ENABLE_COMMERCIAL ) # checking for Header files check_include_file( "inttypes.h" have_inttypes_h ) -check_include_file( "malloc.h" HAVE_MALLOC_H ) check_include_file( "memory.h" HAVE_MEMORY_H ) check_include_file( "stdbool.h" HAVE_STDBOOL_H ) check_include_file( "stdint.h" HAVE_STDINT_H ) @@ -87,7 +86,6 @@ check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H ) check_include_file( "process.h" HAVE_PROCESS_H ) check_include_file( "regex.h" HAVE_REGEX ) -check_function_exists( malloc HAVE_MALLOC ) check_function_exists( memset HAVE_MEMSET ) check_function_exists( mmap HAVE_MMAP ) check_function_exists( munmap HAVE_MUNMAP ) @@ -127,8 +125,7 @@ IF( NOT MSVC ) SET( HAVE_PID_T TRUE ) ENDIF( NOT MSVC ) -SET( EXV_SYMBOLS HAVE_MALLOC_H - HAVE_MEMORY_H +SET( EXV_SYMBOLS HAVE_MEMORY_H HAVE_MEMSET HAVE_MMAP HAVE_MUNMAP diff --git a/config/config.h.cmake b/config/config.h.cmake index 6e49fe98..d863e00d 100644 --- a/config/config.h.cmake +++ b/config/config.h.cmake @@ -53,13 +53,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine EXV_HAVE_REGEX 1 -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#cmakedefine EXV_HAVE_MALLOC 1 - -/* Define to 1 if you have the header file. */ -#cmakedefine EXV_HAVE_MALLOC_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine EXV_HAVE_MEMORY_H 1 diff --git a/config/config.h.in b/config/config.h.in index 5a3a7bdc..58f32eb6 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -50,13 +50,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_REGEX 1 -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h index d371ca97..956b4b6e 100644 --- a/include/exiv2/exv_msvc.h +++ b/include/exiv2/exv_msvc.h @@ -62,13 +62,6 @@ /* Define to 1 if you have the header file. */ /* #undef EXV_HAVE_REGEX */ -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -/* #undef EXV_HAVE_MALLOC */ - -/* Define to 1 if you have the header file. */ -/* #undef EXV_HAVE_MALLOC_H */ - /* Define to 1 if you have the header file. */ /* #undef EXV_HAVE_MEMORY_H */