diff options
| author | Will Newton <will.newton@linaro.org> | 2014-03-17 20:39:24 +0000 |
|---|---|---|
| committer | Will Newton <will.newton@linaro.org> | 2014-03-17 20:39:24 +0000 |
| commit | 7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e (patch) | |
| tree | df851028848aa9a3e87c1e8a118a50bd35af594b | |
| parent | c15cf13a8a672bd27bf3d94b995c52872eed537d (diff) | |
| download | glibc-7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e.tar.gz glibc-7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e.tar.xz glibc-7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e.zip | |
Revert "Fix HP_SMALL_TIMING_AVAIL -Wundef warnings"
This reverts commit 53f1bed39263541ef7f3d86f9701005524938016.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a679274ed8..77c55d5cde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-03-17 Will Newton <will.newton@linaro.org> + * sysdeps/generic/ldsodefs.h: Revert previous + change. + * libio/genops.c: Revert previous change. * libio/libioP.h: Likewise. * stdio-common/vfprintf.c: Likewise. diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index d61b9f9984..65cd709fef 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -322,7 +322,7 @@ struct rtld_global /* The object to be initialized first. */ EXTERN struct link_map *_dl_initfirst; -#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL /* Start time on CPU clock. */ EXTERN hp_timing_t _dl_cpuclock_offset; #endif @@ -535,7 +535,7 @@ struct rtld_global_ro /* All search directories defined at startup. */ EXTERN struct r_search_path_elem *_dl_init_all_dirs; -#if HP_TIMING_AVAIL || defined HP_SMALL_TIMING_AVAIL +#if HP_TIMING_AVAIL || HP_SMALL_TIMING_AVAIL /* Overhead of a high-precision timing measurement. */ EXTERN hp_timing_t _dl_hp_timing_overhead; #endif |