[src/trunk]: src/lib/libc remove duplicate weak aliases

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/119d76959671
branches:  trunk
changeset: 762486:119d76959671
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Feb 21 22:07:44 2011 +0000

description:
remove duplicate weak aliases

diffstat:

 lib/libc/compat/time/compat_localtime.c |  18 +++++++++++++++++-
 lib/libc/time/localtime.c               |  11 ++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 8fc2b1194f1e -r 119d76959671 lib/libc/compat/time/compat_localtime.c
--- a/lib/libc/compat/time/compat_localtime.c   Mon Feb 21 21:43:41 2011 +0000
+++ b/lib/libc/compat/time/compat_localtime.c   Mon Feb 21 22:07:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_localtime.c,v 1.2 2009/01/11 03:46:25 christos Exp $    */
+/*     $NetBSD: compat_localtime.c,v 1.3 2011/02/21 22:07:44 christos Exp $    */
 
 /*
  * Written by Jason R. Thorpe <thorpej%NetBSD.org@localhost>, October 21, 1997.
@@ -16,10 +16,14 @@
 
 #ifdef __weak_alias
 __weak_alias(ctime_r,_ctime_r)
+__weak_alias(ctime_rz,_ctime_rz)
 __weak_alias(gmtime_r,_gmtime_r)
 __weak_alias(localtime_r,_localtime_r)
+__weak_alias(localtime_rz,_localtime_rz)
+__weak_alias(mktime_z,_mktime_z)
 __weak_alias(offtime,_offtime)
 __weak_alias(posix2time,_posix2time)
+__weak_alias(posix2time_z,_posix2time_z)
 __weak_alias(time2posix,_time2posix)
 __weak_alias(timegm,_timegm)
 __weak_alias(timelocal,_timelocal)
@@ -31,18 +35,30 @@
 __warn_references(ctime_r,
     "warning: reference to compatibility ctime_r();"
     " include <time.h> for correct reference")
+__warn_references(ctime_rz,
+    "warning: reference to compatibility ctime_rz();"
+    " include <time.h> for correct reference")
 __warn_references(gmtime_r,
     "warning: reference to compatibility gmtime_r();"
     " include <time.h> for correct reference")
 __warn_references(localtime_r,
     "warning: reference to compatibility localtime_r();"
     " include <time.h> for correct reference")
+__warn_references(localtime_rz,
+    "warning: reference to compatibility localtime_rz();"
+    " include <time.h> for correct reference")
+__warn_references(mktime_z,
+    "warning: reference to compatibility mktime_z();"
+    " include <time.h> for correct reference")
 __warn_references(offtime,
     "warning: reference to compatibility offtime();"
     " include <time.h> for correct reference")
 __warn_references(posix2time,
     "warning: reference to compatibility posix2time();"
     " include <time.h> for correct reference")
+__warn_references(posix2time_z,
+    "warning: reference to compatibility posix2time_z();"
+    " include <time.h> for correct reference")
 __warn_references(time2posix,
     "warning: reference to compatibility time2posix();"
     " include <time.h> for correct reference")
diff -r 8fc2b1194f1e -r 119d76959671 lib/libc/time/localtime.c
--- a/lib/libc/time/localtime.c Mon Feb 21 21:43:41 2011 +0000
+++ b/lib/libc/time/localtime.c Mon Feb 21 22:07:44 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: localtime.c,v 1.55 2011/02/13 23:58:40 christos Exp $  */
+/*     $NetBSD: localtime.c,v 1.56 2011/02/21 22:07:44 christos Exp $  */
 
 /*
 ** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
 #if 0
 static char    elsieid[] = "@(#)localtime.c    8.9";
 #else
-__RCSID("$NetBSD: localtime.c,v 1.55 2011/02/13 23:58:40 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.56 2011/02/21 22:07:44 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -28,14 +28,7 @@
 #include "reentrant.h"
 
 #if defined(__weak_alias)
-__weak_alias(ctime_r,_ctime_r)
-__weak_alias(ctime_rz,_ctime_rz)
 __weak_alias(daylight,_daylight)
-__weak_alias(mktime_z,_mktime_z)
-__weak_alias(localtime_r,_localtime_r)
-__weak_alias(localtime_rz,_localtime_rz)
-__weak_alias(posix2time,_posix2time)
-__weak_alias(posix2time_z,_posix2time_z)
 __weak_alias(tzname,_tzname)
 #endif