Skip to content

Commit

Permalink
Removes outdated checks for ways inline might be defined (#781)
Browse files Browse the repository at this point in the history
These are obsolete now that we require C99.
  • Loading branch information
derobins authored Jun 23, 2021
1 parent e25fa1c commit 82c8013
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 55 deletions.
9 changes: 0 additions & 9 deletions config/cmake/H5pubconf.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@
/* Define to 1 if you have the <hdfs.h> header file. */
#cmakedefine H5_HAVE_HDFS_H @H5_HAVE_HDFS_H@

/* Define if the compiler understands inline */
#cmakedefine H5_HAVE_INLINE @H5_HAVE_INLINE@

/* Define if parallel library will contain instrumentation to detect correct
optimization operation */
#cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
Expand Down Expand Up @@ -432,12 +429,6 @@
/* Define to 1 if you have the `_scrsize' function. */
#cmakedefine H5_HAVE__SCRSIZE @H5_HAVE__SCRSIZE@

/* Define if the compiler understands __inline */
#cmakedefine H5_HAVE___INLINE @H5_HAVE___INLINE@

/* Define if the compiler understands __inline__ */
#cmakedefine H5_HAVE___INLINE__ @H5_HAVE___INLINE__@

/* Define if the library will ignore file locks when disabled */
#cmakedefine H5_IGNORE_DISABLED_FILE_LOCKS @H5_IGNORE_DISABLED_FILE_LOCKS@

Expand Down
8 changes: 0 additions & 8 deletions config/cmake_ext_mod/ConfigureChecks.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -591,14 +591,6 @@ if (WINDOWS)
endif ()
endif ()

#-----------------------------------------------------------------------------
# Determine how 'inline' is used
#-----------------------------------------------------------------------------
foreach (inline_test inline __inline__ __inline)
string (TOUPPER ${inline_test} INLINE_TEST_MACRO)
HDF_FUNCTION_TEST (HAVE_${INLINE_TEST_MACRO})
endforeach ()

#-----------------------------------------------------------------------------
# Check how to print a Long Long integer
#-----------------------------------------------------------------------------
Expand Down
17 changes: 0 additions & 17 deletions config/cmake_ext_mod/HDFTests.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,20 +331,3 @@ int main ()
}

#endif /* HAVE_IOEO */

#if defined( HAVE_INLINE ) || defined( HAVE___INLINE__ ) || defined( HAVE___INLINE )
#ifndef __cplusplus
#if defined( HAVE_INLINE )
# define INLINE_KW inline
#elif defined ( HAVE___INLINE__ )
# define INLINE_KW __inline__
#elif defined ( HAVE___INLINE )
# define INLINE_KW __inline
#endif /* HAVE_INLINE */
typedef int foo_t;
static INLINE_KW foo_t static_foo () { return 0; }
INLINE_KW foo_t foo () {return 0; }
int main(void) { return 0; }
#endif /* __cplusplus */
#endif /* defined( HAVE_INLINE ) || defined( HAVE___INLINE__ ) || defined( HAVE___INLINE ) */

21 changes: 0 additions & 21 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2037,27 +2037,6 @@ AC_CHECK_FUNCS([tmpfile asprintf vasprintf waitpid])
##
AC_C_CONST

AC_MSG_CHECKING([if the compiler understands __inline__])
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[static __inline__ void f(void){return;};]])],
[AC_DEFINE([HAVE___INLINE__], [1], [Define if the compiler understands __inline__]) AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]
)

AC_MSG_CHECKING([if the compiler understands __inline])
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[static __inline void f(void){return;};]])],
[AC_DEFINE([HAVE___INLINE], [1], [Define if the compiler understands __inline]) AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]
)

AC_MSG_CHECKING([if the compiler understands inline])
AC_COMPILE_IFELSE(
[AC_LANG_SOURCE([[static inline void f(void){return;};]])],
[AC_DEFINE([HAVE_INLINE], [1], [Define if the compiler understands inline]) AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]
)

AC_MSG_CHECKING([for __attribute__ extension])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[int __attribute__((unused)) x]])],
[AC_DEFINE([HAVE_ATTRIBUTE], [1],
Expand Down

0 comments on commit 82c8013

Please sign in to comment.