diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5ls.c | 12 | ||||
| -rw-r--r-- | tools/h5toh4.h | 2 | ||||
| -rw-r--r-- | tools/h5tools.c | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/tools/h5ls.c b/tools/h5ls.c index fcd22bd..cfeba7a 100644 --- a/tools/h5ls.c +++ b/tools/h5ls.c @@ -1849,35 +1849,35 @@ get_width(void) width = (int)strtol(s, NULL, 0); } -#if defined(HAVE_STRUCT_VIDEOCONFIG) && defined(HAVE__GETVIDEOCONFIG) +#if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG) { /* Microsoft C */ struct videoconfig w; _getvideoconfig(&w); width = w.numtextcols; } -#elif defined(HAVE_STRUCT_TEXT_INFO) && defined(HAVE_GETTEXTINFO) +#elif defined(H5_HAVE_STRUCT_TEXT_INFO) && defined(H5_HAVE_GETTEXTINFO) { /* Borland C or DJGPPC */ struct text_info w; gettextinfo(&w); width = w.screenwidth; } -#elif defined(HAVE_GETCONSOLESCREENBUFFERINFO) +#elif defined(H5_HAVE_GETCONSOLESCREENBUFFERINFO) { /* Win32 C */ CONSOLE_SCREEN_BUFFER_INFO scr; GetConsoleScreenBufferInfo(con_out, &scr); width = scr.srWindow.Right - scr.srWindow.Left + 1; } -#elif defined(HAVE__SCRSIZE) +#elif defined(H5_HAVE__SCRSIZE) { /* OS/2 */ int w[2]; _scrsize(w); width = w[0]; } -#elif defined(HAVE_TIOCGWINSZ) && defined(HAVE_IOCTL) +#elif defined(H5_HAVE_TIOCGWINSZ) && defined(H5_HAVE_IOCTL) { /* Unix with ioctl(TIOCGWINSZ) */ struct winsize w; @@ -1885,7 +1885,7 @@ get_width(void) width = w.ws_col; } } -#elif defined(HAVE_TIOCGETD) && defined(HAVE_IOCTL) +#elif defined(H5_HAVE_TIOCGETD) && defined(H5_HAVE_IOCTL) { /* Unix with ioctl(TIOCGETD) */ struct uwdata w; diff --git a/tools/h5toh4.h b/tools/h5toh4.h index c262948..a6ff37c 100644 --- a/tools/h5toh4.h +++ b/tools/h5toh4.h @@ -4,7 +4,7 @@ #include <mfhdf.h> #include <hdf5.h> -#ifdef HAVE_SYS_STAT_H +#ifdef H5_HAVE_SYS_STAT_H # include <sys/stat.h> #endif diff --git a/tools/h5tools.c b/tools/h5tools.c index 1323c87..34a00a5 100644 --- a/tools/h5tools.c +++ b/tools/h5tools.c @@ -1534,7 +1534,7 @@ h5dump_simple_dset(FILE *stream, const h5dump_t *info, hid_t dset, /* Print the data */ flags = ((elmtno == 0 ? START_OF_DATA : 0) | - (elmtno + hs_nelmts >= p_nelmts ? END_OF_DATA : 0)); + ((elmtno + hs_nelmts) >= p_nelmts ? END_OF_DATA : 0)); h5dump_simple_data(stream, info, dset, &ctx, flags, hs_nelmts, p_type, sm_buf); @@ -1961,7 +1961,8 @@ h5dump_vlen_dset(FILE *stream, const h5dump_t *info, hid_t dset, hid_t mem_space; const char *bad_type; herr_t ret; - hssize_t start = 0, count = 1; + hssize_t start = 0; + hsize_t count = 1; unsigned int i; memset(&ctx, 0, sizeof(h5dump_context_t)); |