From patchwork Sat Jan 4 17:52:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1217612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108443-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="sNCZ7GQU"; 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 47qqDc3vbXz9sPJ for ; Sun, 5 Jan 2020 04:55:11 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; q=dns; s=default; b=f7w vtJJoY9CbTothnPpQR1cZgL6YcNCRRPOu//qvbzmVCSP0C737KRFXPEQpEFk+R63 vcCr/E/t8eigl/SVeryufhlyVa6xmDeYcTmoZEfetnKwY4bYI56a/SFzLSIP9av/ iwZ/7hClilrlKMNfcxeu/LYs2JMG0FZF1114SUo0= 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:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; s=default; bh=lQYtDUBet 9dow6P3j5ZCgpq3uKE=; b=sNCZ7GQUPZCTQwyFnkXfjfkDNC1kmlxP1zOh3ou86 xgtL5x+zwqXfjvddw8A4XmM8GpIoJYXDLvc9xy4wfWBHm5V83HcG8APfm7V8xWhL 5th9KIz1MM4yAA9tTSf5pkor8iDvIALue1cEnOfE+8ka+1h7WW5MvffP+96jLi2R Ug= Received: (qmail 126737 invoked by alias); 4 Jan 2020 17:55:03 -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 126660 invoked by uid 89); 4 Jan 2020 17:55:02 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=POSIX, HContent-Transfer-Encoding:8bit X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] htl: Drop common tcbhead_t definition Date: Sat, 4 Jan 2020 18:52:43 +0100 Message-Id: <20200104175243.918259-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 This would conflict when including pt-internal.h outside libpthread, while we can actually just include --- htl/pt-internal.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/htl/pt-internal.h b/htl/pt-internal.h index ebe7f43d88..8754f386a6 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -37,6 +37,8 @@ # include #endif +#include + /* Thread state. */ enum pthread_state { @@ -58,16 +60,6 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif -#if !(IS_IN (libpthread)) -/* Type of the TCB. */ -typedef struct -{ - void *tcb; /* Points to this structure. */ - void *dtv; /* Vector of pointers to TLS data. */ - thread_t self; /* This thread's control port. */ -} tcbhead_t; -#endif /* ! IS_IN (libpthread) */ - /* This structure describes a POSIX thread. */ struct __pthread {