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 /sysdeps/unix/sysv/linux/s390/gettimeofday.c | |
| parent | a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5 (diff) | |
| parent | c14874927b499ddfdbb03745bb32bfc778b8595f (diff) | |
| download | glibc-hjl/x32/master.tar.gz glibc-hjl/x32/master.tar.xz glibc-hjl/x32/master.zip | |
Merge remote-tracking branch 'origin/master' into hjl/x32/master hjl/x32/master
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/gettimeofday.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/gettimeofday.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/gettimeofday.c b/sysdeps/unix/sysv/linux/s390/gettimeofday.c index 63faef85b6..efbf1e8110 100644 --- a/sysdeps/unix/sysv/linux/s390/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/s390/gettimeofday.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008-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 @@ -22,7 +22,6 @@ #include <time.h> #include <hp-timing.h> -#undef __gettimeofday #include <bits/libc-vdso.h> /* Get the current time of day and timezone information, @@ -36,6 +35,6 @@ __gettimeofday (tv, tz) { return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz)); } - -INTDEF (__gettimeofday) +libc_hidden_def (__gettimeofday) weak_alias (__gettimeofday, gettimeofday) +libc_hidden_weak (gettimeofday) |