Revert "Fix HP_SMALL_TIMING_AVAIL -Wundef warnings"

This reverts commit 53f1bed39263541ef7f3d86f9701005524938016.

diff --git a/ChangeLog b/ChangeLog
index a679274ed80b2b7999d281e5a37ba7d91711276b..77c55d5cdee6f34daa4fc11d59ef97e4b6e6613c 100644 (file)
--- 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 d61b9f9984adf0444e3091fe69b9472543d20bdc..65cd709fef045b18c2e35db5fd267e38fabb83d4 100644 (file)
--- 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