[svn-r27278] Merge of 27270 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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index 33f2b28..bf4e3ca 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -125,7 +125,7 @@ H5_DLL ssize_t H5VM_memcpyvv(void *_dst,
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline hsize_t H5_ATTR_UNUSED
+static H5_INLINE hsize_t H5_ATTR_UNUSED
 H5VM_vector_reduce_product(unsigned n, const hsize_t *v)
 {
     hsize_t                  ret_value = 1;
@@ -157,7 +157,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline htri_t H5_ATTR_UNUSED
+static H5_INLINE htri_t H5_ATTR_UNUSED
 H5VM_vector_zerop_u(int n, const hsize_t *v)
 {
     htri_t      ret_value=TRUE;       /* Return value */
@@ -192,7 +192,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline htri_t H5_ATTR_UNUSED
+static H5_INLINE htri_t H5_ATTR_UNUSED
 H5VM_vector_zerop_s(int n, const hssize_t *v)
 {
     htri_t      ret_value=TRUE;       /* Return value */
@@ -229,7 +229,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline int H5_ATTR_UNUSED
+static H5_INLINE int H5_ATTR_UNUSED
 H5VM_vector_cmp_u (unsigned n, const hsize_t *v1, const hsize_t *v2)
 {
     int ret_value=0;    /* Return value */
@@ -271,7 +271,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline int H5_ATTR_UNUSED
+static H5_INLINE int H5_ATTR_UNUSED
 H5VM_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2)
 {
     int ret_value=0;    /* Return value */
@@ -308,7 +308,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline void H5_ATTR_UNUSED
+static H5_INLINE void H5_ATTR_UNUSED
 H5VM_vector_inc(int n, hsize_t *v1, const hsize_t *v2)
 {
     while (n--) *v1++ += *v2++;
@@ -355,7 +355,7 @@ static const unsigned char LogTable256[] =
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline unsigned H5_ATTR_UNUSED
+static H5_INLINE unsigned H5_ATTR_UNUSED
 H5VM_log2_gen(uint64_t n)
 {
     unsigned r;                         /* r will be log2(n) */
@@ -403,7 +403,7 @@ static const unsigned MultiplyDeBruijnBitPosition[32] =
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline unsigned H5_ATTR_UNUSED
+static H5_INLINE unsigned H5_ATTR_UNUSED
 H5VM_log2_of2(uint32_t n)
 {
 #ifndef NDEBUG
@@ -424,7 +424,7 @@ H5VM_log2_of2(uint32_t n)
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline hsize_t H5_ATTR_UNUSED
+static H5_INLINE hsize_t H5_ATTR_UNUSED
 H5VM_power2up(hsize_t n)
 {
     hsize_t     ret_value = 1;  /* Return value */
@@ -449,7 +449,7 @@ H5VM_power2up(hsize_t n)
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline unsigned H5_ATTR_UNUSED
+static H5_INLINE unsigned H5_ATTR_UNUSED
 H5VM_limit_enc_size(uint64_t limit)
 {
     return (H5VM_log2_gen(limit) / 8) + 1;
@@ -478,7 +478,7 @@ static const unsigned char H5VM_bit_clear_g[8] = {0x7F, 0xBF, 0xDF, 0xEF, 0xF7,
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline hbool_t H5_ATTR_UNUSED
+static H5_INLINE hbool_t H5_ATTR_UNUSED
 H5VM_bit_get(const unsigned char *buf, size_t offset)
 {
     /* Test the appropriate bit in the buffer */
@@ -505,7 +505,7 @@ H5VM_bit_get(const unsigned char *buf, size_t offset)
  *
  *-------------------------------------------------------------------------
  */
-static H5_inline void H5_ATTR_UNUSED
+static H5_INLINE void H5_ATTR_UNUSED
 H5VM_bit_set(unsigned char *buf, size_t offset, hbool_t val)
 {
     /* Set/reset the appropriate bit in the buffer */