From patchwork Mon Mar 17 12:23:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 106 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx23.g.dreamhost.com (caibbdcaabja.dreamhost.com [208.113.200.190]) by wilcox.dreamhost.com (Postfix) with ESMTP id 92BE63600B0 for ; Mon, 17 Mar 2014 05:24:16 -0700 (PDT) Received: by homiemail-mx23.g.dreamhost.com (Postfix, from userid 14307373) id 5346A61C28C15; Mon, 17 Mar 2014 05:24:16 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx23.g.dreamhost.com 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 homiemail-mx23.g.dreamhost.com (Postfix) with ESMTPS id 38BD961C1E544 for ; Mon, 17 Mar 2014 05:24:16 -0700 (PDT) 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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=x3EoFI8yQk9+g7UG+XpcckENDOvLcPC 5+1cA9buEZvTtnWcwftpjISKmc7PZe+tvuGYPrVJfT9z/sn8aN4sa3D2MAk5c8qg TjI0YMKjSYcz/voRDTQqoIZyyWxI56xKfZ75O47mb5zMV0tjxblJzuk31gbaIIEH X99QlNApWm4U= 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:subject:date:message-id:in-reply-to :references; s=default; bh=BZw0CoxoBG7KMhw9IWivcBets70=; b=CjO0Y sVgyO3HgUEVcK42eaxwFzRN6ABYDYbWvAEKL+cVzf1S2qVNp6bpe8t2qp29gYpTs eQAlwFlcBmiPQaZf29x5x4j39ItAHK2NEUHEN9yYU12b3dbD4AgyvqrjtZAZaC6Z yw8n3gzqEg0fJ4Pzyt1lLAb7JU1I4B2CBUVh7w= Received: (qmail 18966 invoked by alias); 17 Mar 2014 12:23:40 -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 18775 invoked by uid 89); 17 Mar 2014 12:23:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-we0-f180.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=isI9fpCopgB605DHq5rnYKTbS0PIVriESVW2WUlGyrM=; b=VpxmD14f3tA8VfxqMGOQuotkr7RGya00ONXgZjAVsmnyuHiyI1B325BkxCM2CZh6nP JUMSa0suiviCadXI8t6lb6vDJ5C62zM+zA+HO0VzECXuBeRf658GTgO1Ue6PvuPbT2zL Pvkn2DYLRtRaEg6DRR09q874PZYTS/W/8xDmLvy/Ny2gbjkzaLt60un0B1MvPmWaNQ7S A0f2WPlrDdeUG6bWrqrQEJI883ktITBpOhJtjAa9fa/EoTnxuAoDd2avy1XHjw0AY1aA LRswg0tqNbG6Sln9pESJcRXPzJxJwuSu1wl/djjI8hMdMISksJAeW4p/a8x+PRSPgQSt c8xg== X-Gm-Message-State: ALoCoQmWmeAdxH5iwRDBAoFZcda88oqije6yd/HdWohEUs4ymEIV6ZfI3DNjtoJdbXL+zVXTrInR X-Received: by 10.180.107.136 with SMTP id hc8mr9525118wib.11.1395059013219; Mon, 17 Mar 2014 05:23:33 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 4/7] Fix _IO_JUMPS_OFFSET -Wundef warnings Date: Mon, 17 Mar 2014 12:23:21 +0000 Message-Id: <1395059004-20960-4-git-send-email-will.newton@linaro.org> In-Reply-To: <1395059004-20960-1-git-send-email-will.newton@linaro.org> References: <1395059004-20960-1-git-send-email-will.newton@linaro.org> X-DH-Original-To: glibc@patchwork.siddhesh.in ChangeLog: 2014-03-17 Will Newton * libio/genops.c: Check whether _IO_JUMPS_OFFSET is defined with #ifdef rather than #if. * libio/libioP.h: Likewise. * stdio-common/vfprintf.c: Likewise. --- libio/genops.c | 2 +- libio/libioP.h | 2 +- stdio-common/vfprintf.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libio/genops.c b/libio/genops.c index e0ce8cc..42efe58 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -624,7 +624,7 @@ _IO_old_init (fp, flags) fp->_IO_save_end = NULL; fp->_markers = NULL; fp->_cur_column = 0; -#if _IO_JUMPS_OFFSET +#ifdef _IO_JUMPS_OFFSET fp->_vtable_offset = 0; #endif #ifdef _IO_MTSAFE_IO diff --git a/libio/libioP.h b/libio/libioP.h index 8a7b85b..a59e95d 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -106,7 +106,7 @@ extern "C" { #define _IO_WIDE_JUMPS(THIS) ((struct _IO_FILE *) (THIS))->_wide_data->_wide_vtable #define _IO_CHECK_WIDE(THIS) (((struct _IO_FILE *) (THIS))->_wide_data != NULL) -#if _IO_JUMPS_OFFSET +#ifdef _IO_JUMPS_OFFSET # define _IO_JUMPS_FUNC(THIS) \ (*(struct _IO_jump_t **) ((void *) &_IO_JUMPS ((struct _IO_FILE_plus *) (THIS)) \ + (THIS)->_vtable_offset)) diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index f7e5f61..70cdba4 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -2297,7 +2297,7 @@ buffered_vfprintf (_IO_FILE *s, const CHAR_T *format, hp->_mode = -1; #endif hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS|_IO_USER_LOCK; -#if _IO_JUMPS_OFFSET +#ifdef _IO_JUMPS_OFFSET hp->_vtable_offset = 0; #endif #ifdef _IO_MTSAFE_IO