From owner-svn-src-stable@freebsd.org Sun Dec 25 15:06:01 2016 Return-Path: <owner-svn-src-stable@freebsd.org> Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 182C6C8F537; Sun, 25 Dec 2016 15:06:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB3A71C1C; Sun, 25 Dec 2016 15:06:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBPF60sE066373; Sun, 25 Dec 2016 15:06:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBPF60NF066370; Sun, 25 Dec 2016 15:06:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201612251506.uBPF60NF066370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric <dim@FreeBSD.org> Date: Sun, 25 Dec 2016 15:06:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r310542 - stable/11/contrib/jemalloc/include/jemalloc/internal X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree <svn-src-stable.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/> List-Post: <mailto:svn-src-stable@freebsd.org> List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>, <mailto:svn-src-stable-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 25 Dec 2016 15:06:01 -0000 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;