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 /include/sys/time.h | |
| parent | a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5 (diff) | |
| parent | c14874927b499ddfdbb03745bb32bfc778b8595f (diff) | |
| download | glibc-hjl/x32/master.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/masterhjl/x32/master
Diffstat (limited to 'include/sys/time.h')
| -rw-r--r-- | include/sys/time.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/sys/time.h b/include/sys/time.h index d5de942ed6..599e189bcd 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -5,9 +5,8 @@ /* Now document the internal interfaces. */ extern int __gettimeofday (struct timeval *__tv, struct timezone *__tz); -extern int __gettimeofday_internal (struct timeval *__tv, - struct timezone *__tz) - attribute_hidden; +libc_hidden_proto (__gettimeofday) +libc_hidden_proto (gettimeofday) extern int __settimeofday (const struct timeval *__tv, const struct timezone *__tz) attribute_hidden; @@ -23,9 +22,5 @@ extern int __utimes (const char *__file, const struct timeval __tvp[2]) attribute_hidden; extern int __futimes (int fd, const struct timeval tvp[2]) attribute_hidden; -#ifndef NOT_IN_libc -# define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz) -#endif - #endif #endif |