summaryrefslogtreecommitdiffstats
path: root/perform/pio_timer.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
commiteb89d7b53ab95623ab454186a602e1cafc7391f0 (patch)
treeceafe458b3011e38853e765352d3c7e59bbecce1 /perform/pio_timer.h
parent3e468e6ff65d540a439e99ea568a6bff7add7cea (diff)
downloadhdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip
hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz
hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other issues/failures in the branch simultaneously. The h5repack tests are still failing, but Neil will be checking into those, so the branch can be fully functional again. Tested on: Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'perform/pio_timer.h')
-rw-r--r--perform/pio_timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/perform/pio_timer.h b/perform/pio_timer.h
index 943521a..a5ee6d7 100644
--- a/perform/pio_timer.h
+++ b/perform/pio_timer.h
@@ -53,8 +53,8 @@ typedef enum clock_type_ {
/* Miscellaneous identifiers */
enum {
- START, /* Start a specified timer */
- STOP /* Stop a specified timer */
+ TSTART, /* Start a specified timer */
+ TSTOP /* Stop a specified timer */
};
/* The performance time structure */