Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / sys_types_h.m4

diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index a14ba24..9748905 100644 (file)
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,10 +1,10 @@
-# sys_types_h.m4 serial 3
-dnl Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# sys_types_h.m4 serial 5
+dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_SYS_TYPES_H],
+AC_DEFUN_ONCE([gl_SYS_TYPES_H],
 [
   AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS])
   gl_NEXT_HEADERS([sys/types.h])
@@ -16,12 +16,7 @@ AC_DEFUN([gl_SYS_TYPES_H],
   AC_REQUIRE([AC_TYPE_MODE_T])
 
   dnl Whether to override the 'off_t' type.
-  m4_ifdef([gl_LARGEFILE], [
-    AC_REQUIRE([gl_LARGEFILE])
-  ], [
-    WINDOWS_64_BIT_OFF_T=0
-  ])
-  AC_SUBST([WINDOWS_64_BIT_OFF_T])
+  AC_REQUIRE([gl_TYPE_OFF_T])
 ])
 
 AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],