diff options
| author | Rickard Green <rickard@erlang.org> | 2021-06-15 22:26:05 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-06-15 22:26:05 +0200 |
| commit | 10d29e1d76c7ffa786436635d8e9c73786ad6941 (patch) | |
| tree | a9a39eecf6b5f7fa83e1a69f58233d24d591a9a2 /erts/include | |
| parent | 9f98de7f5c1bb27a27b59a89e076b00f7e062d13 (diff) | |
| parent | 719e0734c9160006e039a9094ba305b5d1d9b95e (diff) | |
| download | erlang-10d29e1d76c7ffa786436635d8e9c73786ad6941.tar.gz | |
Merge branch 'rickard/autoconf-2.71/OTP-17414' into rickard/autoconf-2.71/master/OTP-17414
* rickard/autoconf-2.71/OTP-17414:
Update configure scripts
Remove leftovers of standalone build for wx application
Double quote arguments to AC_LANG_PROGRAM() and AC_LANG_SOURCE()
Update configure scripts
Move autoconf helpers from erts to make/autoconf
Update configure scripts
Adapt configure scripts to autoconf 2.71 (step 2)
Update configure scripts
Adapt configure scripts to autoconf 2.71 (step 1)
No tabs in m4 files
Fix monotonic hrtime configure test
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/internal/ethr_internal.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/erts/include/internal/ethr_internal.h b/erts/include/internal/ethr_internal.h index 986e2b84de..f9c351ff63 100644 --- a/erts/include/internal/ethr_internal.h +++ b/erts/include/internal/ethr_internal.h @@ -56,28 +56,22 @@ ethr_ts_event *ethr_get_tse__(void); ETHR_PROTO_NORETURN__ ethr_abort__(void); #ifdef ETHR_INCLUDE_MONOTONIC_CLOCK__ -#undef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME -#if defined(ETHR_HAVE_CLOCK_GETTIME_MONOTONIC) \ - || defined(ETHR_HAVE_MACH_CLOCK_GET_TIME) \ - || defined(ETHR_HAVE_GETHRTIME) -#ifdef ETHR_TIME_WITH_SYS_TIME -# include <time.h> -# include <sys/time.h> -#else -# ifdef ETHR_HAVE_SYS_TIME_H -# include <sys/time.h> -# else +# undef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME +# if defined(ETHR_HAVE_CLOCK_GETTIME_MONOTONIC) \ + || defined(ETHR_HAVE_MACH_CLOCK_GET_TIME) \ + || defined(ETHR_HAVE_GETHRTIME) # include <time.h> +# ifdef ETHR_HAVE_SYS_TIME_H +# include <sys/time.h> +# endif # endif -#endif -#ifdef ETHR_HAVE_MACH_CLOCK_GET_TIME -#include <mach/clock.h> -#include <mach/mach.h> -#endif -#define ETHR_HAVE_ETHR_GET_MONOTONIC_TIME +# ifdef ETHR_HAVE_MACH_CLOCK_GET_TIME +# include <mach/clock.h> +# include <mach/mach.h> +# endif +# define ETHR_HAVE_ETHR_GET_MONOTONIC_TIME ethr_sint64_t ethr_get_monotonic_time(void); int ethr_get_monotonic_time_is_broken(void); -#endif #endif /* ETHR_INCLUDE_MONOTONIC_CLOCK__ */ void ethr_init_event__(void); |