From patchwork Tue Jun 25 00:08:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 33373 Received: (qmail 18000 invoked by alias); 25 Jun 2019 00:11:26 -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 17932 invoked by uid 89); 25 Jun 2019 00:11:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: esa4.hgst.iphmx.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1561421485; x=1592957485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1Ts+L9LsvphXGcc9i3hn0fvhxxdwlDk7l8FRrdZ5G0o=; b=BiSuwerezvc1/gRJ+o0V5aIiBghjnn2/TvA5XRn433VdSLnh7u6pggVh b7PFXfx+FrivVejauxx60GiY2gDA/bqpqSE9dZPTL+etXo8K+5lRaWia4 tmEdw9RNU0/ZOKpbwzYC9w/LIaFqpwB4U8ewgz8/GkD90bywMHqyC9yMB 7cIxeJIlDAcJJzN3UaN8WPbOcfK+OcrBUyKqtziLlP4gHKgZ2aaGk6K1o K/TFuphXn3D93w3E1ee/muXSrF3/oJS6kVpqDNvfQwC5E/kbv9lvziksw 4ZIToZnThHNdNK6x3x16hyiFdVRvyeppRAJl5sKwgi1zIxUNYOgZFd1rw w==; IronPort-SDR: n44Y8C1Sc8oICw3K/J6beciVHzmKGgKf69MrtaSeXbj/f9QqDHfbb3k2ttQTyEeqFoG0FtzcUx rTv2Aap0MH0/u4ylSS/kR7yU/wwJvQOMQnCgXeSrWn94FchKj2DfOfYVs98Kigxd9eptbFArul P8rscjlYlfnKGrVI0nQdtNhy4//Z8Ys7TkDK2nN0C7n4bipT44+OnhgXVaTOnEfjD/vBwO/3bp mBckAC8EPQ/df0C18YlvA46QC26ct25iIev/qTEZ2C7Yx+foDp9UDOEASdkPt2kFvS+4KZ0rVG 22w4P9DROAKCdJT8+Ect+/Bn IronPort-SDR: DX/XFmK7ZIH3VXxiEXPYB03zmp4c6yvbDEsEBM+J8eqxxk7npRDVRaYlgoaujNmlq8MZcgE4Py 7dbwQxbNBR5DZpsiF03LIyTqgLFREmohsjCbx8MTzqXKlA5rZVE1+r4yx829dvqUf6GisEA3Ez hphSWAefrUaNHvSoBEcunrbBxDQZ8F/eq4t61sCExqb53FLIV7bUpG5T+p5UDDEZurI6hSsZws 3VkMP2j9LpUgFW1HAtlehWTBYZjAVWCKWwL7o2I8B3J2ZcAuKYsrkUeZYCOx0YBrCtq6yrKE06 mBM= From: Alistair Francis To: libc-alpha@sourceware.org Cc: arnd@arndb.de, adhemerval.zanella@linaro.org, fweimer@redhat.com, palmer@sifive.com, macro@wdc.com, zongbox@gmail.com, zong@andestech.com, alistair.francis@wdc.com, alistair23@gmail.com Subject: [RFC v2 04/20] include/time.h: Fix conflicting timespec types on 32-bit Date: Mon, 24 Jun 2019 17:08:55 -0700 Message-Id: <79521bb1530c313aad9ff019769a88ee10c5b135.1561421042.git.alistair.francis@wdc.com> In-Reply-To: References: MIME-Version: 1.0 On 32-bit systems with 64-bit time_t the timespec variable will be set to struct __timespec64 which doesn't match the expected function pointer for __clock_settime64. Signed-off-by: Alistair Francis --- include/time.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 7155b2e4db..d62fc7b2c3 100644 --- a/include/time.h +++ b/include/time.h @@ -53,7 +53,8 @@ extern void __tz_compute (__time64_t timer, struct tm *tm, int use_localtime) __THROW attribute_hidden; #if __WORDSIZE == 64 \ - || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) + || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) \ + || __TIMESIZE == 64 # define __timespec64 timespec #else /* The glibc Y2038-proof struct __timespec64 structure for a time value.