From patchwork Sun Jan 28 17:23:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 866877 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-89734-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="mOcrpyoj"; 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 3zTzy03Dhgz9sCZ for ; Mon, 29 Jan 2018 04:23:36 +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:in-reply-to :references; q=dns; s=default; b=yag8JUr5fcqiZeNcVhHE5oKwtDIrgZW NX/55/TLR/TqoVMEnbd3JW+zxefgcF4zMkh+J+lcZMFHa4KpL2miNom8cMITaEK6 WZKjosZm8J880l64eWsezdKy1MGpSMDr+iTrddSabg2v0uI5vN/7gaOrxo19XL1V 1ShOY3BOpDKM= 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:in-reply-to :references; s=default; bh=+TulGf9xSt3KG4hxhyI26YmQLGY=; b=mOcrp yojHrtCNH/1tS6laFyDUXst+90h0lCTuquKdEVgtvnKRpLjT0VmOHG+ZRD6G9shS c76gdTR26gVXAi44FqBSRl9aps0pVo0nHJk2UswNUM4Fnww5QqRlKW/GSDY0YGqh rqjs8ZTeMObA5eybezvCYD+qqs4WJQoz0LRKF8= Received: (qmail 127799 invoked by alias); 28 Jan 2018 17:23:15 -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 127627 invoked by uid 89); 28 Jan 2018 17:23:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 1/3] hurd: Fix building libio/tst-memstream3.c Date: Sun, 28 Jan 2018 18:23:06 +0100 Message-Id: <20180128172308.7647-2-samuel.thibault@ens-lyon.org> In-Reply-To: <20180128172308.7647-1-samuel.thibault@ens-lyon.org> References: <20180128172308.7647-1-samuel.thibault@ens-lyon.org> FWRITE is already an fcntl.h macro. * libio/tst-memstream3.c (FWRITE): Rename to _FWRITE. (do_test_bz20181): Rename accordingly. * libio/tst-wmemstream3.c (FWRITE): Rename accordingly. --- ChangeLog | 3 +++ libio/tst-memstream3.c | 10 +++++----- libio/tst-wmemstream3.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1261148996..23a56d69cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,9 @@ * sysdeps/mach/hurd/check_pf.c: New file. * sysdeps/mach/hurd/libhurduser.abilist: New file. * sysdeps/mach/libmachuser.abilist: New file. + * libio/tst-memstream3.c (FWRITE): Rename to _FWRITE. + (do_test_bz20181): Rename accordingly. + * libio/tst-wmemstream3.c (FWRITE): Rename accordingly. 2008-12-18 Thomas Schwinge diff --git a/libio/tst-memstream3.c b/libio/tst-memstream3.c index 331314f784..df0da5bac5 100644 --- a/libio/tst-memstream3.c +++ b/libio/tst-memstream3.c @@ -29,7 +29,7 @@ # define W(o) o # define OPEN_MEMSTREAM open_memstream # define PRINTF printf -# define FWRITE fwrite +# define _FWRITE fwrite # define FPUTC fputc # define STRCMP strcmp #endif @@ -114,14 +114,14 @@ do_test_bz20181 (void) if (fp == NULL) ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM)); - if ((ret = FWRITE (W("abc"), 1, 3, fp)) != 3) - ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno); + if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3) + ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); if (fseek (fp, 0, SEEK_SET) != 0) ERROR_RET1 ("fseek failed (errno = %d)\n", errno); - if (FWRITE (W("z"), 1, 1, fp) != 1) - ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE), errno); + if (_FWRITE (W("z"), 1, 1, fp) != 1) + ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); if (fflush (fp) != 0) ERROR_RET1 ("fflush failed (errno = %d)\n", errno); diff --git a/libio/tst-wmemstream3.c b/libio/tst-wmemstream3.c index d0e4973768..4edc2b9094 100644 --- a/libio/tst-wmemstream3.c +++ b/libio/tst-wmemstream3.c @@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) #define W(o) L##o #define OPEN_MEMSTREAM open_wmemstream #define PRINTF wprintf -#define FWRITE fwwrite +#define _FWRITE fwwrite #define FPUTC fputwc #define STRCMP wcscmp