From 7579d8d5cbe81f1eb8e99c5956ed5c9ff4006d4e Mon Sep 17 00:00:00 2001 From: Will Newton Date: Mon, 17 Mar 2014 20:39:24 +0000 Subject: [PATCH] Revert "Fix HP_SMALL_TIMING_AVAIL -Wundef warnings" This reverts commit 53f1bed39263541ef7f3d86f9701005524938016. --- ChangeLog | 3 +++ sysdeps/generic/ldsodefs.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a679274..77c55d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-03-17 Will Newton + * 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 d61b9f9..65cd709 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 -- 2.7.4