No system or kernel uapi header defines umode_t, so just define it unconditionally. Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- configure.ac | 1 - include/builddefs.in | 3 --- include/platform_defs.h.in | 3 --- m4/Makefile | 1 - m4/package_types.m4 | 14 -------------- 5 files changed, 22 deletions(-) delete mode 100644 m4/package_types.m4 diff --git a/configure.ac b/configure.ac index 59c52545e..9133f88d9 100644 --- a/configure.ac +++ b/configure.ac @@ -250,7 +250,6 @@ fi AC_CHECK_SIZEOF([long]) AC_CHECK_SIZEOF([char *]) -AC_TYPE_UMODE_T AC_MANUAL_FORMAT AC_HAVE_LIBURCU_ATOMIC64 diff --git a/include/builddefs.in b/include/builddefs.in index a3745efbe..6e7eaface 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -136,9 +136,6 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall # _LGPL_SOURCE is for liburcu to work correctly with GPL/LGPL programs PCFLAGS = -D_LGPL_SOURCE -D_GNU_SOURCE $(GCCFLAGS) -ifeq ($(HAVE_UMODE_T),yes) -PCFLAGS += -DHAVE_UMODE_T -endif DEPENDFLAGS = -D__linux__ ifeq ($(HAVE_FLS),yes) LCFLAGS+= -DHAVE_FLS diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in index 02b0e08b5..17262dcff 100644 --- a/include/platform_defs.h.in +++ b/include/platform_defs.h.in @@ -30,10 +30,7 @@ #undef SIZEOF_CHAR_P #define BITS_PER_LONG (SIZEOF_LONG * CHAR_BIT) -/* Check whether to define umode_t ourselves. */ -#ifndef HAVE_UMODE_T typedef unsigned short umode_t; -#endif /* Define if you want gettext (I18N) support */ #undef ENABLE_GETTEXT diff --git a/m4/Makefile b/m4/Makefile index 731205303..84174c3d3 100644 --- a/m4/Makefile +++ b/m4/Makefile @@ -22,7 +22,6 @@ LSRCFILES = \ package_pthread.m4 \ package_sanitizer.m4 \ package_services.m4 \ - package_types.m4 \ package_icu.m4 \ package_urcu.m4 \ package_utilies.m4 \ diff --git a/m4/package_types.m4 b/m4/package_types.m4 deleted file mode 100644 index 6e817a310..000000000 --- a/m4/package_types.m4 +++ /dev/null @@ -1,14 +0,0 @@ -# -# Check if we have umode_t -# -AH_TEMPLATE([HAVE_UMODE_T], [Whether you have umode_t]) -AC_DEFUN([AC_TYPE_UMODE_T], - [ AC_MSG_CHECKING([for umode_t]) - AC_COMPILE_IFELSE( - [ AC_LANG_PROGRAM([[ -#include <asm/types.h> - ]], [[ -umode_t umode; - ]]) - ], AC_DEFINE(HAVE_UMODE_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no)) - ]) -- 2.39.2
