From patchwork Mon Mar 17 12:23:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 330918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 7D61A2C00CB for ; Mon, 17 Mar 2014 23:23:56 +1100 (EST) 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=QA8a8o2Bwy33I7WQ18xt4IViQLd7Fry HvJeypSyd8VsU3gm4uX+XdisLaP2eU5Ux6bZlMLbsqdAwuIY5bsQE+hyeoe5oPmh ZLYl08xJC76aVsjVmY8U1/WKK5gRWjKDCS0rHrbyIlxUOu/E8fbUEcuYa1vo8NtO Cicx/gQLnZgw= 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=AQ1XGJlz1zJV0RbRiw5gwsyELlg=; b=tn3YP /b/i7Edi1fFK17zE8Cca69e3Buk1qcFvyd4GLUUz8gaTuN5uFe70ZNtDUAk3UmFq szcouVbCpeivFg8hegUtWFo+zFn8TT42iHSmH8MWg5PJxXmldVWFnPOxZcryEhMj CKLoHsQxuXpieJmWlr4cR71sIEBVTPKMdlArTU= Received: (qmail 18791 invoked by alias); 17 Mar 2014 12:23:39 -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 18742 invoked by uid 89); 17 Mar 2014 12:23:35 -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-f173.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=lMNuobJGJLNbmZYo8cqte6W1IcPyPEq/ABuSZzbNppI=; b=dviASESMLBrwR0otxvpWOW8WYGpYdNVRs8DAaIBF4o5gJENDXZPIRSGr7aUdvfFrXc sKjsRgwoASSCEIYrC9aRj3gyS1d4KkjGZLyGGl9N9wKpKx8f2tQxXACGhpw5CzXz3AQ5 13KhGusdtjA0Wuon4M/4HsGsDSSUIMXvRoOZF/iPOQf0n7cmTRLPSMsUC8d1bnex7L5n klF6LCE6CGQK81peEmyWvVw+ZBKf/NfBvz72j7ytlLiRB0V+lRxl3P2JNvEQlE6399Sg HcSNjZIO4G+jbmrVVmAgySUSz+iE9GA/H0qJgYoNSzXuIlgZ8emlzn6X7PlYiUuKSUWX +X2g== X-Gm-Message-State: ALoCoQnZdYIU9wrVJ6lfRqtlDNS9pYQKYT5J+g3ZflwLiEGYuFgKmIFUkx/Fg/nattn9dZDVu8u9 X-Received: by 10.180.11.36 with SMTP id n4mr9386949wib.4.1395059010800; Mon, 17 Mar 2014 05:23:30 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH 2/7] Fix _STRING_ARCH_unaligned -Wundef warnings Date: Mon, 17 Mar 2014 12:23:19 +0000 Message-Id: <1395059004-20960-2-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> ChangeLog: 2014-03-17 Will Newton * crypt/md5.c: Check whether _STRING_ARCH_unaligned is defined with #ifdef rather than #if. * crypt/sha256.c: Likewise. * crypt/sha512.c: Likewise. * include/arpa/nameser.h: Likewise. * stdlib/getenv.c: Likewise. * string/bits/string2.h: Likewise. --- crypt/md5.c | 2 +- crypt/sha256.c | 2 +- crypt/sha512.c | 2 +- include/arpa/nameser.h | 2 +- stdlib/getenv.c | 8 ++++---- string/bits/string2.h | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crypt/md5.c b/crypt/md5.c index a444a18..116537a 100644 --- a/crypt/md5.c +++ b/crypt/md5.c @@ -242,7 +242,7 @@ md5_process_bytes (buffer, len, ctx) /* Process available complete blocks. */ if (len >= 64) { -#if !_STRING_ARCH_unaligned +#ifndef _STRING_ARCH_unaligned /* To check alignment gcc has an appropriate operator. Other compilers don't. */ # if __GNUC__ >= 2 diff --git a/crypt/sha256.c b/crypt/sha256.c index a5df83e..39f9afb 100644 --- a/crypt/sha256.c +++ b/crypt/sha256.c @@ -177,7 +177,7 @@ __sha256_process_bytes (buffer, len, ctx) /* Process available complete blocks. */ if (len >= 64) { -#if !_STRING_ARCH_unaligned +#ifndef _STRING_ARCH_unaligned /* To check alignment gcc has an appropriate operator. Other compilers don't. */ # if __GNUC__ >= 2 diff --git a/crypt/sha512.c b/crypt/sha512.c index f0c0725..4bbe496 100644 --- a/crypt/sha512.c +++ b/crypt/sha512.c @@ -199,7 +199,7 @@ __sha512_process_bytes (buffer, len, ctx) /* Process available complete blocks. */ if (len >= 128) { -#if !_STRING_ARCH_unaligned +#ifndef _STRING_ARCH_unaligned /* To check alignment gcc has an appropriate operator. Other compilers don't. */ # if __GNUC__ >= 2 diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 57f7457..a0aea28 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -11,7 +11,7 @@ extern const struct _ns_flagdata _ns_flagdata[] attribute_hidden; -#if _STRING_ARCH_unaligned +#ifdef _STRING_ARCH_unaligned # undef NS_GET16 # define NS_GET16(s, cp) \ diff --git a/stdlib/getenv.c b/stdlib/getenv.c index e8cb913..ed4de87 100644 --- a/stdlib/getenv.c +++ b/stdlib/getenv.c @@ -45,14 +45,14 @@ getenv (name) /* The name of the variable consists of only one character. Therefore the first two characters of the environment entry are this character and a '=' character. */ -#if __BYTE_ORDER == __LITTLE_ENDIAN || !_STRING_ARCH_unaligned +#if __BYTE_ORDER == __LITTLE_ENDIAN || !defined _STRING_ARCH_unaligned name_start = ('=' << 8) | *(const unsigned char *) name; #else name_start = '=' | ((*(const unsigned char *) name) << 8); #endif for (ep = __environ; *ep != NULL; ++ep) { -#if _STRING_ARCH_unaligned +#ifdef _STRING_ARCH_unaligned uint16_t ep_start = *(uint16_t *) *ep; #else uint16_t ep_start = (((unsigned char *) *ep)[0] @@ -64,7 +64,7 @@ getenv (name) } else { -#if _STRING_ARCH_unaligned +#ifdef _STRING_ARCH_unaligned name_start = *(const uint16_t *) name; #else name_start = (((const unsigned char *) name)[0] @@ -75,7 +75,7 @@ getenv (name) for (ep = __environ; *ep != NULL; ++ep) { -#if _STRING_ARCH_unaligned +#ifdef _STRING_ARCH_unaligned uint16_t ep_start = *(uint16_t *) *ep; #else uint16_t ep_start = (((unsigned char *) *ep)[0] diff --git a/string/bits/string2.h b/string/bits/string2.h index 1b6a1ef..6cb0c4f 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -46,7 +46,7 @@ # endif #endif -#if _STRING_ARCH_unaligned +#ifdef _STRING_ARCH_unaligned /* If we can do unaligned memory accesses we must know the endianess. */ # include # include @@ -95,7 +95,7 @@ __STRING2_COPY_TYPE (8); /* Set N bytes of S to C. */ #if !defined _HAVE_STRING_ARCH_memset # if !__GNUC_PREREQ (3, 0) -# if _STRING_ARCH_unaligned +# ifdef _STRING_ARCH_unaligned # define memset(s, c, n) \ (__extension__ (__builtin_constant_p (n) && (n) <= 16 \ ? ((n) == 1 \ @@ -223,7 +223,7 @@ __STRING2_COPY_TYPE (8); # endif # if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES -# if _STRING_ARCH_unaligned +# ifdef _STRING_ARCH_unaligned # ifndef _FORCE_INLINES # define __mempcpy_args(src) \ ((const char *) (src))[0], ((const char *) (src))[2], \ @@ -419,7 +419,7 @@ extern void *__rawmemchr (const void *__s, int __c); : strcpy (dest, src))) # endif -# if _STRING_ARCH_unaligned +# ifdef _STRING_ARCH_unaligned # ifndef _FORCE_INLINES # define __strcpy_args(src) \ __extension__ __STRING2_SMALL_GET16 (src, 0), \ @@ -598,7 +598,7 @@ __strcpy_small (char *__dest, # endif # if !__GNUC_PREREQ (3, 0) || defined _FORCE_INLINES -# if _STRING_ARCH_unaligned +# ifdef _STRING_ARCH_unaligned # ifndef _FORCE_INLINES # define __stpcpy_args(src) \ __extension__ __STRING2_SMALL_GET16 (src, 0), \