diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-10-14 20:56:52 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-10-14 20:56:52 +0000 |
| commit | a33c43a5aefbbb2d1e00432ba034d256af0008ae (patch) | |
| tree | 80aa9060de68814fb13960b308a0faa95fb8ba94 /include | |
| parent | 4cee966cabbbd52c38260dff95f5ab43772ba5d9 (diff) | |
| download | glibc-a33c43a5aefbbb2d1e00432ba034d256af0008ae.tar glibc-a33c43a5aefbbb2d1e00432ba034d256af0008ae.tar.gz glibc-a33c43a5aefbbb2d1e00432ba034d256af0008ae.tar.bz2 glibc-a33c43a5aefbbb2d1e00432ba034d256af0008ae.zip | |
Updated to fedora-glibc-20071014T1847
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 15 | ||||
| -rw-r--r-- | include/stdio.h | 1 | ||||
| -rw-r--r-- | include/time.h | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/include/features.h b/include/features.h index 0e471875cb..3ab68b67cd 100644 --- a/include/features.h +++ b/include/features.h @@ -282,14 +282,13 @@ #endif #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ - && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 \ - && (__GNUC_PREREQ (4, 1) \ - || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \ - || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \ - && __GNUC_MINOR__ == 4 \ - && (__GNUC_PATCHLEVEL__ > 2 \ - || (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8)))) -# if _FORTIFY_SOURCE > 1 + && defined __OPTIMIZE__ && __OPTIMIZE__ > 0 +# if !__GNUC_PREREQ (4, 1) +# ifdef __GNUC_RH_RELEASE__ +# warning _FORTIFY_SOURCE supported only with GCC 4.1 and later +# endif +# define __USE_FORTIFY_LEVEL 0 +# elif _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 diff --git a/include/stdio.h b/include/stdio.h index 084c02ea1e..3c11037490 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -138,6 +138,7 @@ libc_hidden_proto (rewind) libc_hidden_proto (fileno) libc_hidden_proto (fwrite) libc_hidden_proto (fseek) +libc_hidden_proto (ftello) libc_hidden_proto (fflush_unlocked) libc_hidden_proto (fread_unlocked) libc_hidden_proto (fwrite_unlocked) diff --git a/include/time.h b/include/time.h index ed6cb3669f..e896406db4 100644 --- a/include/time.h +++ b/include/time.h @@ -46,6 +46,9 @@ extern void __tzfile_compute (time_t timer, int use_localtime, struct tm *tp); extern void __tzfile_default (const char *std, const char *dst, long int stdoff, long int dstoff); +extern void __tzset_parse_tz (const char *tz); +extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime) + __THROW internal_function; /* Subroutine of `mktime'. Return the `time_t' representation of TP and normalize TP, given that a `struct tm *' maps to a `time_t' as performed |