Author: dim Date: Sun Dec 25 15:05:59 2016 New Revision: 310542 URL: https://svnweb.freebsd.org/changeset/base/310542
Log: Merge r304542 from projects/clang390-import (this fix was obsoleted in head by an update to jemalloc 4.3.1 in r308473): Temporarily fix "macro expansion producing 'defined' has undefined behavior" in jemalloc, by defining JEMALLOC_CLOCK_GETTIME in a portable manner. Modified: stable/11/contrib/jemalloc/include/jemalloc/internal/nstime.h Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/jemalloc/include/jemalloc/internal/nstime.h ============================================================================== --- stable/11/contrib/jemalloc/include/jemalloc/internal/nstime.h Sun Dec 25 14:58:50 2016 (r310541) +++ stable/11/contrib/jemalloc/include/jemalloc/internal/nstime.h Sun Dec 25 15:05:59 2016 (r310542) @@ -1,8 +1,11 @@ /******************************************************************************/ #ifdef JEMALLOC_H_TYPES -#define JEMALLOC_CLOCK_GETTIME defined(_POSIX_MONOTONIC_CLOCK) \ - && _POSIX_MONOTONIC_CLOCK >= 0 +#if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 +#define JEMALLOC_CLOCK_GETTIME 1 +#else +#define JEMALLOC_CLOCK_GETTIME 0 +#endif typedef struct nstime_s nstime_t; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
