diff options
| -rw-r--r-- | cross/lib/unistd.in.h | 18 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 1 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/cross/lib/unistd.in.h b/cross/lib/unistd.in.h index bfc501e5a7d..8ba9867894e 100644 --- a/cross/lib/unistd.in.h +++ b/cross/lib/unistd.in.h @@ -40,6 +40,24 @@ # undef _GL_INCLUDING_UNISTD_H #endif +/* Avoid lseek bugs in FreeBSD, macOS <https://bugs.gnu.org/61386>. + This bug is fixed after FreeBSD 13; see <https://bugs.freebsd.org/256205>. + Use macOS "9999" to stand for a future fixed macOS version. */ +#if defined __FreeBSD__ && __FreeBSD__ < 14 +# undef SEEK_DATA +# undef SEEK_HOLE +#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA +# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +# include <AvailabilityMacros.h> +# endif +# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \ + || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000) +# include <sys/fcntl.h> /* It also defines the two macros. */ +# undef SEEK_DATA +# undef SEEK_HOLE +# endif +#endif + /* Get all possible declarations of gethostname(). */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \ && !defined _GL_INCLUDING_WINSOCK2_H diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index e577d8063fd..a5be32427b6 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -1116,6 +1116,7 @@ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ JARSIGNER = @JARSIGNER@ JAVAC = @JAVAC@ +JAVAFLAGS = @JAVAFLAGS@ JPEG_CFLAGS = @JPEG_CFLAGS@ JSON_CFLAGS = @JSON_CFLAGS@ JSON_LIBS = @JSON_LIBS@ diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index fa9e589778f..473284753b4 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -28,7 +28,7 @@ # other built files. -# This macro should be invoked from .//configure.ac, in the section +# This macro should be invoked from ./configure.ac, in the section # "Checks for programs", right after AC_PROG_CC, and certainly before # any checks for libraries, header files, types and library functions. AC_DEFUN([gl_EARLY], @@ -234,7 +234,7 @@ AC_DEFUN([gl_EARLY], # Code from module xsize: ]) -# This macro should be invoked from .//configure.ac, in the section +# This macro should be invoked from ./configure.ac, in the section # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ |