summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkamil <kamil@NetBSD.org>2018-01-07 21:19:35 +0000
committerkamil <kamil@NetBSD.org>2018-01-07 21:19:35 +0000
commita8d880363d8c1741219d8a6777efb4fc0ddd6597 (patch)
treec1135b9b6d112e22a87cb1fa4a1a9ad4a7c978d0 /lib
parent4f35d46d40ddf52ac9078dfd5645352070b152c2 (diff)
Revert asctime() namespacing
asctime() is optionally a cancellation point in the POSIX spec. It's not true for NetBSD. Requested by <joerg>
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/include/namespace.h3
-rw-r--r--lib/libc/time/asctime.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
index 42c46108335..03c59eba0b8 100644
--- a/lib/libc/include/namespace.h
+++ b/lib/libc/include/namespace.h
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.194 2018/01/07 15:28:33 kamil Exp $ */
+/* $NetBSD: namespace.h,v 1.195 2018/01/07 21:19:35 kamil Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -211,7 +211,6 @@
#define arc4random_buf _arc4random_buf
#define arc4random_stir _arc4random_stir
#define arc4random_uniform _arc4random_uniform
-#define asctime _asctime
#define asctime_r _asctime_r
#define asprintf _asprintf
#define asprintf_l _asprintf_l
diff --git a/lib/libc/time/asctime.c b/lib/libc/time/asctime.c
index fe8950d2f32..7892a71accf 100644
--- a/lib/libc/time/asctime.c
+++ b/lib/libc/time/asctime.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asctime.c,v 1.23 2018/01/05 20:01:31 kamil Exp $ */
+/* $NetBSD: asctime.c,v 1.24 2018/01/07 21:19:35 kamil Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -16,7 +16,7 @@
#if 0
static char elsieid[] = "@(#)asctime.c 8.5";
#else
-__RCSID("$NetBSD: asctime.c,v 1.23 2018/01/05 20:01:31 kamil Exp $");
+__RCSID("$NetBSD: asctime.c,v 1.24 2018/01/07 21:19:35 kamil Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -27,7 +27,6 @@ __RCSID("$NetBSD: asctime.c,v 1.23 2018/01/05 20:01:31 kamil Exp $");
#include <stdio.h>
#ifdef __weak_alias
-__weak_alias(asctime,_asctime)
__weak_alias(asctime_r,_asctime_r)
#endif