diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2012-02-28 18:26:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2012-02-28 18:26:34 (GMT) |
| commit | df6c92e506a81ed0ede7dacc1269d21ae3e0f411 (patch) | |
| tree | c67a1ca1bb197289bd955ca4065f0c611dbcdf6e /perform/sio_timer.h | |
| parent | 9423da6a4d53cb2eb6c48a9e0d254307bbf8ae9b (diff) | |
| download | hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.zip hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.gz hdf5-df6c92e506a81ed0ede7dacc1269d21ae3e0f411.tar.bz2 | |
[svn-r22004] Reduced warnings and fixed conflicts resulting from including h5tools.h
Tested: local linux
Diffstat (limited to 'perform/sio_timer.h')
| -rw-r--r-- | perform/sio_timer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perform/sio_timer.h b/perform/sio_timer.h index 1fa880d..04432af 100644 --- a/perform/sio_timer.h +++ b/perform/sio_timer.h @@ -27,7 +27,7 @@ #endif #ifdef H5_HAVE_WINSOCK_H -# include <winsock2.h> +# include <winsock2.h> #endif /* H5_HAVE_WINSOCK_H */ /* The different types of timers we can have */ @@ -52,8 +52,8 @@ typedef enum timer_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 */ |