diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
| commit | 4a951a53063efa51d3dba672dccd8a59be78ac8f (patch) | |
| tree | d66d2833fdd3e4a1b83e9521b957e99945c82659 /src/H5private.h | |
| parent | 79fe6d27f022b0124782d6e0c6eb345f2e669095 (diff) | |
| parent | df8bd7ccd6cd8d50280a3a7d862064c6340e2169 (diff) | |
| download | hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.zip hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.gz hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.bz2 | |
[svn-r27286] merge from trunk.
Diffstat (limited to 'src/H5private.h')
| -rw-r--r-- | src/H5private.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/H5private.h b/src/H5private.h index d4fb6e9..61ffddd 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -183,11 +183,22 @@ #endif /*H5_HAVE_WIN32_API*/ -/* H5_inline */ -#ifndef H5_inline -#define H5_inline -#endif /* H5_inline */ - +/* Various ways that inline functions can be declared */ +#if defined(H5_HAVE___INLINE__) + /* GNU (alternative form) */ + #define H5_INLINE __inline__ +#elif defined(H5_HAVE___INLINE) + /* Visual Studio */ + #define H5_INLINE __inline +#elif defined(H5_HAVE_INLINE) + /* GNU, C++ + * Use "inline" as a last resort on the off-chance that there will + * be C++ problems. + */ + #define H5_INLINE inline +#else + #define H5_INLINE +#endif /* inline choices */ #ifndef F_OK # define F_OK 00 |