From patchwork Fri Mar 14 12:53:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 330302 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 63EA92C00B8 for ; Fri, 14 Mar 2014 23:55:16 +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:to:from:subject:date:message-id:mime-version :content-type; q=dns; s=default; b=GHdPVDJQGNmf5FKozlVoT0eim3V04 rcPRHX07Cvjn8vNgyBmIsz7FXcyq4B3iv3eFMcYaOz+wwe/uUpXTLGLWjZn+3Zgg t05kSESl7hJ1sQl+leh7EfZvh3gekkv0hKMgyWKp93nqtbf3whm67fgIGU/5cjvT lfJyONRoyedu8c= 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:to:from:subject:date:message-id:mime-version :content-type; s=default; bh=yZBsbQgrAoD83EX+Db0H/VxgtkQ=; b=ME7 Kq+VbRjXcCMqBrw9CnMrNstit5gzMb84ktYIOLRr0ESsxucWPoTpJReNst4UsIFN fmadmVnCJ+J1HvirIiAOg/cA/F3NjsjcTW1b4gM3uNMlZCO0dAv/ccgb4nzC1axv MpnJlLZFb2tf/gL89kc+EmZ3ufL/vIv2CVJRmPAQ= Received: (qmail 23329 invoked by alias); 14 Mar 2014 12:55:11 -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 23316 invoked by uid 89); 14 Mar 2014 12:55:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: plane.gmane.org To: libc-alpha@sourceware.org From: Stefan Liebler Subject: [PATCH] S/390: Fix namespace violation Date: Fri, 14 Mar 2014 13:53:46 +0100 Lines: 64 Message-ID: Mime-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 Hi, on S390x some conformance tests are failing due to namespace violation: conform/POSIX/sys/stat.h/conform.out conform/XPG4/ftw.h/conform.out conform/UNIX98/mqueue.h/conform.out conform/UNIX98/sys/stat.h/conform.out conform/UNIX98/ftw.h/conform.out conform/XOPEN2K/sys/stat.h/conform.out conform/XOPEN2K/ftw.h/conform.out conform/POSIX2008/mqueue.h/conform.out conform/POSIX2008/sys/stat.h/conform.out conform/XOPEN2K8/mqueue.h/conform.out conform/XOPEN2K8/sys/stat.h/conform.out conform/XOPEN2K8/ftw.h/conform.out After renaming pad0 to __pad0 in struct stat, the namespace isn`t violated anymore. Bye --- 2014-03-14 Stefan Liebler * sysdeps/unix/sysv/linux/s390/bits/stat.h (struct stat): Rename member pad0 to __pad0 --- diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h index c154fe9..bb4465c 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/stat.h +++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h @@ -55,7 +55,7 @@ struct stat __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ #ifdef __USE_XOPEN2K8 @@ -152,7 +152,7 @@ struct stat64 __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __pad0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ # ifdef __USE_XOPEN2K8