From patchwork Wed Apr 29 22:35:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 6493 Received: (qmail 44894 invoked by alias); 29 Apr 2015 22:35:10 -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 44862 invoked by uid 89); 29 Apr 2015 22:35:08 -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, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Change clock_t to long int. Message-Id: <20150429223505.7CC102C3B98@topped-with-meat.com> Date: Wed, 29 Apr 2015 15:35:05 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=oG_cAbAgXKSOhAMjh2wA:9 a=CjuIK1q_8ugA:10 * sysdeps/nacl/bits/typesizes.h (__CLOCK_T_TYPE): Use __SLONGWORD_TYPE. * sysdeps/nacl/nacl-interfaces.h (nacl_abi_clock_t): Use clock_t. diff --git a/sysdeps/nacl/bits/typesizes.h b/sysdeps/nacl/bits/typesizes.h index 6443886..ed1b5dc 100644 --- a/sysdeps/nacl/bits/typesizes.h +++ b/sysdeps/nacl/bits/typesizes.h @@ -46,7 +46,7 @@ #define __FSFILCNT64_T_TYPE __FSFILCNT_T_TYPE #define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE -#define __CLOCK_T_TYPE __SQUAD_TYPE +#define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SQUAD_TYPE #define __USECONDS_T_TYPE __U32_TYPE #define __SUSECONDS_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/nacl/nacl-interfaces.h b/sysdeps/nacl/nacl-interfaces.h index 8d28e1a..0c886a5 100644 --- a/sysdeps/nacl/nacl-interfaces.h +++ b/sysdeps/nacl/nacl-interfaces.h @@ -41,8 +41,9 @@ typedef struct dirent nacl_abi_dirent_t; typedef struct timeval nacl_abi_timeval_t; typedef struct timespec nacl_abi_timespec_t; -/* XXX change clock_t? */ -typedef uint32_t nacl_abi_clock_t; +/* This is unsigned in the IRT ABI, but it's traditionally 'long int', + so we stick with that. */ +typedef clock_t nacl_abi_clock_t; typedef int32_t nacl_abi_blkcnt_t;