diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-08-03 21:04:29 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-08-03 21:04:29 (GMT) |
| commit | ff5070329c34c74082570c925e2a2b9089b99b29 (patch) | |
| tree | 5337fe5780e5afed0c9431969972ab2126d586c1 /src/H5config.h.in | |
| parent | b94c3d53d2354f7e4552a72b1d82b57ec40fd93e (diff) | |
| download | hdf5-ff5070329c34c74082570c925e2a2b9089b99b29.zip hdf5-ff5070329c34c74082570c925e2a2b9089b99b29.tar.gz hdf5-ff5070329c34c74082570c925e2a2b9089b99b29.tar.bz2 | |
[svn-r27457] Merge of r27278 from trunk. Fixes HDFFV-9119 and HDFFV-9421.
Changes that allow the autotools to correctly deal with inline
functions.
- Inline markup schemes are now checked with AC_COMPILE_IFELSE
tests instead of AC_C_INLINE.
- The inline designator is now H5_INLINE instead of H5_inline.
This is now set in H5private.h instead of H5pubconf.h.
Tested on: h5committest
Diffstat (limited to 'src/H5config.h.in')
| -rw-r--r-- | src/H5config.h.in | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/H5config.h.in b/src/H5config.h.in index 8b4648f..c7488d1 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -144,6 +144,9 @@ /* Define to 1 if you have the `get_fpc_csr' function. */ #undef HAVE_GET_FPC_CSR +/* Define if the compiler understands inline */ +#undef HAVE_INLINE + /* Define if library will contain instrumentation to detect correct optimization operation */ #undef HAVE_INSTRUMENTED_LIBRARY @@ -367,6 +370,12 @@ /* Define to 1 if you have the `_scrsize' function. */ #undef HAVE__SCRSIZE +/* Define if the compiler understands __inline */ +#undef HAVE___INLINE + +/* Define if the compiler understands __inline__ */ +#undef HAVE___INLINE__ + /* Define if your system can't handle converting floating-point values to long long. */ #undef HW_FP_TO_LLONG_NOT_WORKS @@ -595,12 +604,6 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef 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 -#undef inline -#endif - /* Define to `long int' if <sys/types.h> does not define. */ #undef off_t |