diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-29 04:58:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 04:58:38 (GMT) |
| commit | 734d317da9c759799c92ff47e05e3be7e3e969a9 (patch) | |
| tree | f928e0c17e91b9a1124ee9e4b0217a1b4fe68b17 /config | |
| parent | 5ddfbc2a736f7f4cc8b109ee3f3e53c4655dbec1 (diff) | |
| download | hdf5-734d317da9c759799c92ff47e05e3be7e3e969a9.zip hdf5-734d317da9c759799c92ff47e05e3be7e3e969a9.tar.gz hdf5-734d317da9c759799c92ff47e05e3be7e3e969a9.tar.bz2 | |
Removes obsolete equivalents of C99's __func__ (#800)
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 6 | ||||
| -rw-r--r-- | config/cmake_ext_mod/ConfigureChecks.cmake | 3 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFTests.c | 40 |
3 files changed, 0 insertions, 49 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index e14e212..be366a8 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -102,9 +102,6 @@ and unions */ #cmakedefine H5_HAVE_C99_DESIGNATED_INITIALIZER @H5_HAVE_C99_DESIGNATED_INITIALIZER@ -/* Define if the compiler understands the __func__ keyword */ -#cmakedefine H5_HAVE_C99_FUNC @H5_HAVE_C99_FUNC@ - /* Define to 1 if you have the `clock_gettime' function. */ #cmakedefine H5_HAVE_CLOCK_GETTIME @H5_HAVE_CLOCK_GETTIME@ @@ -159,9 +156,6 @@ /* Define to 1 if you have the `fseeko' function. */ #cmakedefine H5_HAVE_FSEEKO @H5_HAVE_FSEEKO@ -/* Define if the compiler understands the __FUNCTION__ keyword */ -#cmakedefine H5_HAVE_FUNCTION @H5_HAVE_FUNCTION@ - /* Determine if INTEGER*16 is available */ #cmakedefine H5_HAVE_Fortran_INTEGER_SIZEOF_16 @H5_HAVE_Fortran_INTEGER_SIZEOF_16@ diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake index ad8496a..ccf7c85 100644 --- a/config/cmake_ext_mod/ConfigureChecks.cmake +++ b/config/cmake_ext_mod/ConfigureChecks.cmake @@ -74,7 +74,6 @@ if (WINDOWS) set (${HDF_PREFIX}_HAVE_STRDUP 1) if (NOT MINGW) set (${HDF_PREFIX}_HAVE_GETHOSTNAME 1) - set (${HDF_PREFIX}_HAVE_FUNCTION 1) endif () if (NOT UNIX AND NOT CYGWIN) set (${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO 1) @@ -507,8 +506,6 @@ endif () if (MINGW OR NOT WINDOWS) foreach (other_test HAVE_ATTRIBUTE - HAVE_C99_FUNC - HAVE_FUNCTION HAVE_C99_DESIGNATED_INITIALIZER SYSTEM_SCOPE_THREADS HAVE_SOCKLEN_T diff --git a/config/cmake_ext_mod/HDFTests.c b/config/cmake_ext_mod/HDFTests.c index 365931b..c434be5 100644 --- a/config/cmake_ext_mod/HDFTests.c +++ b/config/cmake_ext_mod/HDFTests.c @@ -44,26 +44,6 @@ main () #endif -#ifdef HAVE_C99_FUNC - -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ - const char *fname = __func__; - ; - return 0; -} - -#endif - #ifdef HAVE_ATTRIBUTE #if 0 @@ -90,26 +70,6 @@ int __attribute__((unused)) x #endif /* HAVE_ATTRIBUTE */ -#ifdef HAVE_FUNCTION - -#ifdef FC_DUMMY_MAIN -#ifndef FC_DUMMY_MAIN_EQ_F77 -# ifdef __cplusplus - extern "C" -# endif - int FC_DUMMY_MAIN() { return 1; } -#endif -#endif -int -main () -{ -(void)__FUNCTION__ - ; - return 0; -} - -#endif /* HAVE_FUNCTION */ - #ifdef HAVE_TIMEZONE #ifdef HAVE_SYS_TIME_H |