From patchwork Thu Jun 21 06:46:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 932574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-93514-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="L1+bdMQw"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41BC1J2Pyxz9ryk for ; Thu, 21 Jun 2018 16:47:15 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= A7XD1wovVV6+tobEIef+vmgdSb/RQQEFljqzhAMJgKw1KlyNgsz/xSbYXZ7tiVaX a2gqSuhiLkrsJZhJTgCD4aDkfdjh195V1zDlrun02Hzm9Jo7Pmmn3efWGGMSQ/sq jeHDEWv/oNYfCPX2Q9PYvtmlW1v7YyObUGp2dXnOlac= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=RB++sw DUE2kQvp3OfSJuEc1vpJY=; b=L1+bdMQwLHEiVCkg2VgHw0dme0MR4hQt0v5c8V s5lu+kLz4CWrCmdKrx3IapPfeVsvM1acr6oMNo9eJveOWLfAZdaS5REek3/6wA2o pyu4u/E7fu6xaGXx6hmCFCUKOO6TndXcXKN5ijZfdfXfgCKw1rEfrrFH+VMyCas4 yeTkc= Received: (qmail 89215 invoked by alias); 21 Jun 2018 06:47:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 89000 invoked by uid 89); 21 Jun 2018 06:46:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Date: Thu, 21 Jun 2018 08:46:54 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] time: Define _STRUCT_TIMESPEC in User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20180621064654.2D7DA4289B0D0@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) After commit d76d3703551a362b472c866b5b6089f66f8daa8e ("Fix missing timespec definition for sys/stat.h (BZ #21371)"), sanitizer builds start to fail due to a conflicting definition of struct timespec in . Define _STRUCT_TIMESPEC, which is already checked in the kernel header, to support including after . 2018-06-21 Florian Weimer * time/bits/types/struct_timespec.h (_STRUCT_TIMESPEC): Define. diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h index 644db9fdb6..bde7e2826d 100644 --- a/time/bits/types/struct_timespec.h +++ b/time/bits/types/struct_timespec.h @@ -1,6 +1,10 @@ #ifndef __timespec_defined #define __timespec_defined 1 +#ifndef _STRUCT_TIMESPEC +# define _STRUCT_TIMESPEC 1 +#endif + #include /* POSIX.1b structure for a time value. This is like a `struct timeval' but