diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/H5RA.c | 4 | ||||
-rw-r--r-- | src/H5config.h.in | 33 | ||||
-rw-r--r-- | src/H5private.h | 18 |
3 files changed, 52 insertions, 3 deletions
@@ -431,8 +431,8 @@ H5RA_isa(H5G_entry_t *ent) } /* Is `raw' a dataset? */ - if (H5G_find(ent, "raw", NULL, &d_ent)<0 || - (exists=H5D_isa(&d_ent))<0) { + if (H5G_find(ent, "raw", NULL, &d_ent)<0) HRETURN(FALSE); + if ((exists=H5D_isa(&d_ent))<0) { HRETURN_ERROR(H5E_DATASET, H5E_NOTFOUND, FAIL, "not found"); } else if (!exists) { HRETURN(FALSE); diff --git a/src/H5config.h.in b/src/H5config.h.in index a08c7e2..88b268d 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -59,6 +59,18 @@ /* Define if `struct stat' has the `st_blocks' field */ #undef HAVE_STAT_ST_BLOCKS +/* Define if `struct text_info' is defined */ +#undef HAVE_STRUCT_TEXT_INFO + +/* Define if `struct videoconfig' is defined */ +#undef HAVE_STRUCT_VIDEOCONFIG + +/* Define if the ioctl TIOCGETD is defined */ +#undef HAVE_TIOCGETD + +/* Define if the ioctl TIOCGWINSZ is defined */ +#undef HAVE_TIOCGWINSZ + /* The number of bytes in a __int64. */ #undef SIZEOF___INT64 @@ -92,6 +104,15 @@ /* Define if you have the BSDgettimeofday function. */ #undef HAVE_BSDGETTIMEOFDAY +/* Define if you have the GetConsoleScreenBufferInfo function. */ +#undef HAVE_GETCONSOLESCREENBUFFERINFO + +/* Define if you have the _getvideoconfig function. */ +#undef HAVE__GETVIDEOCONFIG + +/* Define if you have the _scrsize function. */ +#undef HAVE__SCRSIZE + /* Define if you have the difftime function. */ #undef HAVE_DIFFTIME @@ -110,9 +131,15 @@ /* Define if you have the getrusage function. */ #undef HAVE_GETRUSAGE +/* Define if you have the gettextinfo function. */ +#undef HAVE_GETTEXTINFO + /* Define if you have the gettimeofday function. */ #undef HAVE_GETTIMEOFDAY +/* Define if you have the ioctl function. */ +#undef HAVE_IOCTL + /* Define if you have the lseek64 function. */ #undef HAVE_LSEEK64 @@ -128,9 +155,15 @@ /* Define if you have the <io.h> header file. */ #undef HAVE_IO_H +/* Define if you have the <sys/ioctl.h> header file. */ +#undef HAVE_SYS_IOCTL_H + /* Define if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H +/* Define if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + /* Define if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H diff --git a/src/H5private.h b/src/H5private.h index 2769269..3ef8c1d 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -39,12 +39,20 @@ # include <unistd.h> #endif #ifdef _POSIX_VERSION -# include <sys/stat.h> # include <sys/wait.h> # include <pwd.h> #endif /* + * The `struct stat' data type for stat() and fstat(). This is a Posix file + * but often apears on non-Posix systems also. The `struct stat' is required + * for hdf5 to compile, although only a few fields are actually used. + */ +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif + +/* * If a program may include both `time.h' and `sys/time.h' then * TIME_WITH_SYS_TIME is defined (see AC_HEADER_TIME in configure.in). * On some older systems, `sys/time.h' includes `time.h' but `time.h' is not @@ -72,6 +80,14 @@ #endif /* + * Unix ioctls. These are used by h5ls (and perhaps others) to determine a + * resonable output width. + */ +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif + +/* * Win32 is severely broken when it comes to ANSI-C and Posix.1 compliance. */ #ifdef HAVE_IO_H |