diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-24 13:23:44 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-24 13:23:44 -0700 |
commit | f7d63c839b817c3e26f9126fca2ccd19cc021ea1 (patch) | |
tree | 554aa4396c60f256433d56c688613d7292f9f521 /time/gettimeofday.c | |
parent | a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5 (diff) | |
parent | c14874927b499ddfdbb03745bb32bfc778b8595f (diff) | |
download | glibc-f7d63c839b817c3e26f9126fca2ccd19cc021ea1.tar.gz glibc-f7d63c839b817c3e26f9126fca2ccd19cc021ea1.tar.xz glibc-f7d63c839b817c3e26f9126fca2ccd19cc021ea1.zip |
Merge remote-tracking branch 'origin/master' into hjl/x32/master hjl/x32/master
Diffstat (limited to 'time/gettimeofday.c')
-rw-r--r-- | time/gettimeofday.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/time/gettimeofday.c b/time/gettimeofday.c index cfe6549db0..7eb770c2d7 100644 --- a/time/gettimeofday.c +++ b/time/gettimeofday.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,8 +18,6 @@ #include <errno.h> #include <sys/time.h> -#undef __gettimeofday - /* Get the current time of day and timezone information, putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled. Returns 0 on success, -1 on errors. */ @@ -31,8 +29,9 @@ __gettimeofday (tv, tz) __set_errno (ENOSYS); return -1; } -stub_warning (gettimeofday) - -INTDEF(__gettimeofday) +libc_hidden_def (__gettimeofday) weak_alias (__gettimeofday, gettimeofday) +libc_hidden_weak (gettimeofday) + +stub_warning (gettimeofday) #include <stub-tag.h> |