diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-24 19:21:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 19:21:46 (GMT) |
| commit | 5c3f4b3cb26f92fa0cc60f750816e122e8a68f8d (patch) | |
| tree | 1c4c63c9edb53edc704c6d90637497f7e875b757 | |
| parent | 782e8826b73309aeed5916751d6156570740a778 (diff) | |
| download | hdf5-5c3f4b3cb26f92fa0cc60f750816e122e8a68f8d.zip hdf5-5c3f4b3cb26f92fa0cc60f750816e122e8a68f8d.tar.gz hdf5-5c3f4b3cb26f92fa0cc60f750816e122e8a68f8d.tar.bz2 | |
Removes ancient Autotools cruft (#790)
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/H5private.h | 21 |
2 files changed, 2 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index cfd9d0c..cf1223b 100644 --- a/configure.ac +++ b/configure.ac @@ -476,15 +476,9 @@ esac ## Data types and their sizes. ## AC_TYPE_OFF_T -AC_CHECK_TYPE([size_t], [], - [AC_DEFINE_UNQUOTED([size_t], [unsigned long], - [Define to `unsigned long' if <sys/types.h> does not define.])]) AC_CHECK_TYPE([ssize_t], [], [AC_DEFINE_UNQUOTED([ssize_t], [long], [Define to `long' if <sys/types.h> does not define.])]) -AC_CHECK_TYPE([ptrdiff_t], [], - [AC_DEFINE_UNQUOTED([ptrdiff_t], [long], - [Define to `long' if <sys/types.h> does not define.])]) AC_C_BIGENDIAN AC_CHECK_SIZEOF([char]) AC_CHECK_SIZEOF([short]) @@ -1229,8 +1223,6 @@ AC_CHECK_LIB([dl], [dlopen]) ## ---------------------------------------------------------------------- ## Check for system header files. ## -AC_HEADER_STDC -AC_HEADER_TIME ## Unix AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h]) @@ -2025,8 +2017,6 @@ AC_CHECK_FUNCS([tmpfile asprintf vasprintf waitpid]) ## ---------------------------------------------------------------------- ## Check compiler characteristics ## -AC_C_CONST - AC_MSG_CHECKING([for __attribute__ extension]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int __attribute__((unused)) x]])], [AC_DEFINE([HAVE_ATTRIBUTE], [1], diff --git a/src/H5private.h b/src/H5private.h index ce6681a..327198d 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -38,11 +38,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> /* POSIX headers */ #ifdef H5_HAVE_UNISTD_H #include <pwd.h> #include <unistd.h> +#include <sys/time.h> #include <sys/types.h> #include <sys/wait.h> #endif @@ -62,25 +64,6 @@ #endif /* - * If a program may include both `time.h' and `sys/time.h' then - * TIME_WITH_SYS_TIME is defined (see AC_HEADER_TIME in configure.ac). - * On some older systems, `sys/time.h' includes `time.h' but `time.h' is not - * protected against multiple inclusion, so programs should not explicitly - * include both files. This macro is useful in programs that use, for example, - * `struct timeval' or `struct timezone' as well as `struct tm'. It is best - * used in conjunction with `HAVE_SYS_TIME_H', whose existence is checked - * by `AC_CHECK_HEADERS(sys/time.h)' in configure.ac. - */ -#if defined(H5_TIME_WITH_SYS_TIME) -#include <sys/time.h> -#include <time.h> -#elif defined(H5_HAVE_SYS_TIME_H) -#include <sys/time.h> -#else -#include <time.h> -#endif - -/* * Longjumps are used to detect alignment constrants */ #ifdef H5_HAVE_SETJMP_H |