From patchwork Thu Apr 19 21:51:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 901527 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-91742-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="Rt2Bcmdf"; 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 40Rt3N6Xb4z9s1t for ; Fri, 20 Apr 2018 07:51:12 +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:from:to:cc:subject:date:message-id; q=dns; s= default; b=pGsV6qFtikFP71rpz9/Wqr+eNKN47u3xvNsZOL+MeKqBpMdbJOeQN 7veNK5kMdyID+qQOaO6ztdf7hb9qH9CmPt5wyHZ80K9S8bakKzvRbwAZ3aj5LWM+ LhFLpeVBuUs/UimJ9H4QypscLxsTbaEMb2f/ohjypJ3myqDsNoZ9is= 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; s=default; bh=LZf80HYzE8CbEMiULpwJXiHo54Q=; b=Rt2Bcmdf1UN9r6VIXEUo70yYOLDv fxLVXY6E3UILGZXUKdmzZgtsjLAIwFqrzJiPKq1xs7IQpfhCHpPksfDH774lpiNg nTq+mOA0zCuaJFirIz2KzjaTTUdjDYX79u1pdnUgexnJH6cKdR/RM4D/aLEMlpeE +dnympHmadoQb/c= Received: (qmail 78856 invoked by alias); 19 Apr 2018 21:51: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 78846 invoked by uid 89); 19 Apr 2018 21:51:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, URIBL_RED autolearn=ham version=3.3.2 spammy=Ring, delays, del X-HELO: mail2-relais-roc.national.inria.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix termios.h symbols Date: Thu, 19 Apr 2018 23:51:01 +0200 Message-Id: <20180419215101.45938-1-samuel.thibault@ens-lyon.org> * bits/termios.h [__USE_XOPEN || __USE_XOPEN2K8] (IXANY): Define. [__USE_XOPEN && !__USE_XOPEN2K] (IUCLC, OLCUC): Define. [__USE_XOPEN] (OFDEL): New macro. [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro. --- ChangeLog | 4 ++++ bits/termios.h | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 337eb6b35e..12ab0d6018 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,10 @@ sigevent's sigev_notify_attributes field a pthread_attr_t*. * bits/types/siginfo_t.h: Remove siginfo struct name, unused and non-compliant. + * bits/termios.h [__USE_XOPEN || __USE_XOPEN2K8] (IXANY): Define. + [__USE_XOPEN && !__USE_XOPEN2K] (IUCLC, OLCUC): Define. + [__USE_XOPEN] (OFDEL): New macro. + [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro. 2018-04-18 Joseph Myers diff --git a/bits/termios.h b/bits/termios.h index 9fc526e765..c6d572bbc3 100644 --- a/bits/termios.h +++ b/bits/termios.h @@ -123,13 +123,13 @@ struct termios #define ICRNL (1 << 8) /* Map CR to NL on input. */ #define IXON (1 << 9) /* Enable start/stop output control. */ #define IXOFF (1 << 10) /* Enable start/stop input control. */ -#if defined __USE_MISC || defined __USE_UNIX98 +#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_XOPEN2K8 # define IXANY (1 << 11) /* Any character will restart after stop. */ #endif #ifdef __USE_MISC # define IMAXBEL (1 << 13) /* Ring bell when input queue is full. */ #endif -#ifdef __USE_GNU +#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K) # define IUCLC (1 << 14) /* Translate upper case input to lower case. */ #endif @@ -172,11 +172,12 @@ struct termios # define VT0 (0 << 16) /* VT delay type 0. */ # define VT1 (1 << 16) /* VT delay type 1. */ #endif /* __USE_MISC || __USE_XOPEN */ -#ifdef __USE_GNU +#if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K) # define OLCUC (1 << 17) /* Translate lower case output to upper case */ #endif #ifdef __USE_XOPEN # define OFILL (1 << 18) /* Send fill characters for delays. */ +# define OFDEL (1 << 19) /* Fill is DEL. */ #endif /* Control modes. */ @@ -237,6 +238,11 @@ struct termios #define TOSTOP _TOSTOP #ifdef __USE_MISC # define FLUSHO (1 << 23) /* Output being flushed (state). */ +#endif +#if defined __USE_XOPEN && !defined __USE_XOPEN2K +# define XCASE (1 << 24) /* Canonical upper/lower case. */ +#endif +#ifdef __USE_MISC # define NOKERNINFO (1 << 25) /* Disable VSTATUS. */ # define PENDIN (1 << 29) /* Retype pending input (state). */ #endif