diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 03:10:29 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 03:10:29 +0000 |
| commit | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (patch) | |
| tree | 8d1f20c152e2eec919c58e3259a20cc038b5d7c4 /include/time.h | |
| parent | 8c325ee38bf779dc5d51e41281d3b8230c3af971 (diff) | |
| download | uClibc-alpine-164a928b77f596b6617a4bbf43a2c06bc35a5602.tar.bz2 uClibc-alpine-164a928b77f596b6617a4bbf43a2c06bc35a5602.tar.xz | |
Merge from trunk.
Diffstat (limited to 'include/time.h')
| -rw-r--r-- | include/time.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/time.h b/include/time.h index 376fe3754..645042777 100644 --- a/include/time.h +++ b/include/time.h @@ -143,10 +143,10 @@ struct tm #ifdef __UCLIBC_HAS_TM_EXTENSIONS__ #ifdef __USE_BSD long int tm_gmtoff; /* Seconds east of UTC. */ - __const char *tm_zone; /* Timezone abbreviation. */ + __const char *tm_zone; /* Timezone abbreviation. */ #else long int __tm_gmtoff; /* Seconds east of UTC. */ - __const char *__tm_zone; /* Timezone abbreviation. */ + __const char *__tm_zone; /* Timezone abbreviation. */ #endif #endif /* __UCLIBC_HAS_TM_EXTENSIONS__ */ }; @@ -229,17 +229,6 @@ extern size_t strftime_l (char *__restrict __s, size_t __maxsize, extern char *strptime_l (__const char *__restrict __s, __const char *__restrict __fmt, struct tm *__tp, __locale_t __loc) __THROW; - - -extern size_t __strftime_l (char *__restrict __s, size_t __maxsize, - __const char *__restrict __format, - __const struct tm *__restrict __tp, - __locale_t __loc) __THROW; - -extern char *__strptime_l (__const char *__restrict __s, - __const char *__restrict __fmt, struct tm *__tp, - __locale_t __loc) __THROW; - # endif #endif |