diff options
author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-10-22 20:00:04 (GMT) |
---|---|---|
committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2015-10-22 20:00:04 (GMT) |
commit | 6ab00dd2a053ebd5e979f255654934c98e35770a (patch) | |
tree | 7a0bdec4df55e848455a0c1e1d7d87741569aeff /config/cmake/H5pubconf.h.in | |
parent | 87919a0ceb90fc270392a69be68fe8a2155eef77 (diff) | |
download | hdf5-6ab00dd2a053ebd5e979f255654934c98e35770a.zip hdf5-6ab00dd2a053ebd5e979f255654934c98e35770a.tar.gz hdf5-6ab00dd2a053ebd5e979f255654934c98e35770a.tar.bz2 |
[svn-r28192] Merge r28188 from trunk
Fix inline/__inline__/__inline detection with CMake after autotools changes
Diffstat (limited to 'config/cmake/H5pubconf.h.in')
-rw-r--r-- | config/cmake/H5pubconf.h.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 874c8f0..13740ea 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -145,6 +145,9 @@ /* Define to 1 if you have the `gettimeofday' function. */ #cmakedefine H5_HAVE_GETTIMEOFDAY @H5_HAVE_GETTIMEOFDAY@ +/* Define if the compiler understands inline */ +#cmakedefine H5_HAVE_INLINE @H5_HAVE_INLINE@ + /* Define if library will contain instrumentation to detect correct optimization operation */ #cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@ @@ -359,6 +362,12 @@ /* Define to 1 if you have the `_scrsize' function. */ #cmakedefine H5_HAVE__SCRSIZE @H5_HAVE__SCRSIZE@ +/* Define if the compiler understands __inline */ +#cmakedefine H5_HAVE___INLINE @H5_HAVE___INLINE@ + +/* Define if the compiler understands __inline__ */ +#cmakedefine H5_HAVE___INLINE__ @H5_HAVE___INLINE__@ + /* Define if HDF5's high-level library headers should be included in hdf5.h */ #cmakedefine H5_INCLUDE_HL @H5_INCLUDE_HL@ @@ -604,12 +613,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #cmakedefine H5_const -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#cmakedefine H5_inline @H5_inline@ -#endif - /* Define to `long int' if <sys/types.h> does not define. */ #cmakedefine H5_off_t |