Merge pull request #2398 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '04e67af8f968b2c6f50cb42990d3dfa79aa353d9':
  Fix Fortran macro use and jni comment

4 files changed, 12 insertions, 16 deletions

diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake
index 465afbf..c5d8200 100644
--- a/config/cmake/HDF5UseFortran.cmake
+++ b/config/cmake/HDF5UseFortran.cmake
@@ -81,10 +81,7 @@ READ_SOURCE("PROGRAM PROG_FC_HAVE_C_LONG_DOUBLE" "END PROGRAM PROG_FC_HAVE_C_LON
 if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
   check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_HAVE_C_LONG_DOUBLE SRC_EXT f90)
 else ()
-  CHECK_FORTRAN_FEATURE(c_long_double
-    "${SOURCE_CODE}"
-    FORTRAN_HAVE_C_LONG_DOUBLE
-  )
+  CHECK_FORTRAN_FEATURE(c_long_double "${SOURCE_CODE}" FORTRAN_HAVE_C_LONG_DOUBLE)
 endif ()
 
 if (${FORTRAN_HAVE_C_LONG_DOUBLE})
@@ -99,10 +96,7 @@ READ_SOURCE("MODULE type_mod" "END PROGRAM PROG_FC_C_LONG_DOUBLE_EQ_C_DOUBLE" SO
 if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
   check_fortran_source_compiles (${SOURCE_CODE} FORTRAN_C_LONG_DOUBLE_IS_UNIQUE SRC_EXT f90)
 else ()
-  CHECK_FORTRAN_FEATURE(c_long_double
-    "${SOURCE_CODE}"
-    FORTRAN_C_LONG_DOUBLE_IS_UNIQUE
-  )
+  CHECK_FORTRAN_FEATURE(c_long_double "${SOURCE_CODE}" FORTRAN_C_LONG_DOUBLE_IS_UNIQUE)
 endif ()
 if (${FORTRAN_C_LONG_DOUBLE_IS_UNIQUE})
   set (${HDF_PREFIX}_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE 1)
diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake
index b0f3972..0a6a092 100644
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@@ -183,27 +183,27 @@ else ()
 
   # Check for Non-standard extension intrinsic function SIZEOF
   set (${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF FALSE)
-  CHECK_FORTRAN_FEATURE(${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF)
+  CHECK_FORTRAN_FEATURE(sizeof_code ${SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_SIZEOF)
 
   # Check for F2008 standard intrinsic function C_SIZEOF
   set (${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF FALSE)
-  CHECK_FORTRAN_FEATURE(${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF)
+  CHECK_FORTRAN_FEATURE(c_sizeof_code ${C_SIZEOF_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_C_SIZEOF)
 
   # Check for F2008 standard intrinsic function STORAGE_SIZE
-  CHECK_FORTRAN_FEATURE(${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE)
+  CHECK_FORTRAN_FEATURE(storage_size_code ${STORAGE_SIZE_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_STORAGE_SIZE)
 
   # Check for F2008 standard intrinsic module "ISO_FORTRAN_ENV"
   set (${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV FALSE)
-  CHECK_FORTRAN_FEATURE(${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV)
+  CHECK_FORTRAN_FEATURE(iso_fortran_env_code ${ISO_FORTRAN_ENV_CODE} ${HDF_PREFIX}_HAVE_ISO_FORTRAN_ENV)
 
   set (${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE FALSE)
-  CHECK_FORTRAN_FEATURE(${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
+  CHECK_FORTRAN_FEATURE(realisnotdouble_code ${REALISNOTDOUBLE_CODE} ${HDF_PREFIX}_FORTRAN_DEFAULT_REAL_NOT_DOUBLE)
 
   #-----------------------------------------------------------------------------
   # Checks if the ISO_C_BINDING module meets all the requirements
   #-----------------------------------------------------------------------------
   set (${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING FALSE)
-  CHECK_FORTRAN_FEATURE(${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING)
+  CHECK_FORTRAN_FEATURE(iso_c_binding_code ${ISO_C_BINDING_CODE} ${HDF_PREFIX}_FORTRAN_HAVE_ISO_C_BINDING)
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index 74866ed..33d3c2b 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -164,7 +164,8 @@ done:
 #ifdef notdef
 /* 10/28/99 -- added code to copy the array -- this is not used,
  * but serves as a reminder in case we try to implement this in
- */ the future....
+ * the future....
+ */ 
 /*
  *  Note:  the argument coord is actually long coord[][], which has been
  *         flattened by the caller.
diff --git a/java/src/jni/h5sImp.h b/java/src/jni/h5sImp.h
index 87661e3..a07d4c5 100644
--- a/java/src/jni/h5sImp.h
+++ b/java/src/jni/h5sImp.h
@@ -51,7 +51,8 @@ Java_hdf_hdf5lib_H5__1H5Scopy
 #ifdef notdef
 /* 10/28/99 -- added code to copy the array -- this is not used,
  * but serves as a reminder in case we try to implement this in
- */ the future....
+ * the future....
+ */ 
 /*
  *  Note:  the argument coord is actually long coord[][], which has been
  *         flattened by the caller.