summaryrefslogtreecommitdiffstats
path: root/src/H5trace.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-03-11 06:35:51 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-03-11 06:35:51 (GMT)
commit3ed20376e058b8d17c9c91d2c06107fcb67a0c3c (patch)
treec8346273c47d67d80ec2ef517bc09c7532c2d932 /src/H5trace.c
parent04a3b2a4580ed6f2df9949d88cd553f85860e91e (diff)
downloadhdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.zip
hdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.tar.gz
hdf5-3ed20376e058b8d17c9c91d2c06107fcb67a0c3c.tar.bz2
[svn-r26426] Merge of r26424 from the autotools_rework branch.
Made the chkmanifest script a little more sh-friendly. Tested: Manually on jam by modifying svn-controlled files
Diffstat (limited to 'src/H5trace.c')
-rw-r--r--src/H5trace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5trace.c b/src/H5trace.c
index 6634a2a..cb5a8c8 100644
--- a/src/H5trace.c
+++ b/src/H5trace.c
@@ -129,34 +129,34 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
void *vp = NULL;
FILE *out = H5_debug_g.trace;
H5_timer_t event_time;
- static H5_timer_t first_time = {0.0F, 0.0F, 0.0F};
+ static H5_timer_t first_time = {H5_DOUBLE(0.0), H5_DOUBLE(0.0), H5_DOUBLE(0.0)};
static int current_depth = 0;
static int last_call_depth = 0;
/* FUNC_ENTER() should not be called */
if(!out)
- return 0.0F; /*tracing is off*/
+ return H5_DOUBLE(0.0); /*tracing is off*/
va_start(ap, type);
if(H5_debug_g.ttop) {
if(returning) {
if(current_depth > 1) {
--current_depth;
- return 0.0F;
+ return H5_DOUBLE(0.0);
} /* end if */
} /* end if */
else {
if(current_depth > 0) {
/*do not update last_call_depth*/
current_depth++;
- return 0.0F;
+ return H5_DOUBLE(0.0);
} /* end if */
} /* end else */
} /* end if */
/* Get time for event */
- if(HDfabs(first_time.etime) < 0.0000000001F)
+ if(HDfabs(first_time.etime) < H5_DOUBLE(0.0000000001))
/* That is == 0.0, but direct comparison between floats is bad */
H5_timer_begin(&first_time);
if(H5_debug_g.ttimes)