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: 26352 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BD3B0202FA for ; Mon, 17 Mar 2014 12:24:26 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id lg15sf13227814vcb.11 for ; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=isI9fpCopgB605DHq5rnYKTbS0PIVriESVW2WUlGyrM=; b=KBoB4y4JszIA+vvcYe2PFUPuhO+mTmXCT/D8gJ98qQptfnIRIiGd6p5mQQkWFX/GXJ 8gowLHKn4nZjA+yANkaxOOM9th0Iml09RTCXK6LnYcw2B2WUtgH4l9zlvI8vwgnEVHTw P1ngMOhaFmg39BU/6+JMueic8BlRXy9CkNvYUR/eUtH9OW52yDUA1TWgQObbXIJ9VaI1 XuZkNXp+C4qRUOyx0n5B8pnMbhqFwdHI/7WQaUEx2b75ihQ3ljcifq93tYpCmO8O0y0N mVZ/K6R0MCbs0l2IQo4h69Dw1AxpG5lFo3Chl0PXEgDjSjx5Vx9nISwl3wsP0N4tDC9B 4MyA== X-Gm-Message-State: ALoCoQlLyp7G+eDQmtBuFlOp2R6/jc0+egeKM5u2ATFcCLNQI5C0Erp8+tLCFcn/Fzw50i4/JlNI X-Received: by 10.236.120.11 with SMTP id o11mr2030753yhh.39.1395059066494; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.138 with SMTP id c10ls1576649qga.63.gmail; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) X-Received: by 10.52.18.70 with SMTP id u6mr16809688vdd.11.1395059066362; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) Received: from mail-vc0-x232.google.com (mail-vc0-x232.google.com [2607:f8b0:400c:c03::232]) by mx.google.com with ESMTPS id e10si5185815vcq.77.2014.03.17.05.24.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 05:24:26 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::232; Received: by mail-vc0-f178.google.com with SMTP id im17so5610887vcb.37 for ; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) X-Received: by 10.58.200.168 with SMTP id jt8mr330399vec.30.1395059066292; Mon, 17 Mar 2014 05:24:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp123180vck; Mon, 17 Mar 2014 05:24:25 -0700 (PDT) X-Received: by 10.66.251.42 with SMTP id zh10mr25916274pac.84.1395059065484; Mon, 17 Mar 2014 05:24:25 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id gu6si9846668pac.407.2014.03.17.05.24.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Mar 2014 05:24:25 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-48212-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 18966 invoked by alias); 17 Mar 2014 12:23:40 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 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-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-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::232 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 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