diff options
| author | Paul Eggert | 2025-05-07 23:57:18 -0700 |
|---|---|---|
| committer | Paul Eggert | 2025-05-08 00:16:46 -0700 |
| commit | c9c6abfa81c58b4a62f4fa5fcaad94b219f5d706 (patch) | |
| tree | d018390e6532a07121cc64e4ce7c80c7618f9876 /lib/diffseq.h | |
| parent | 322ed637b4c2fe826d41c5af3800b2f2e381bb0f (diff) | |
| download | emacs-c9c6abfa81c58b4a62f4fa5fcaad94b219f5d706.tar.gz emacs-c9c6abfa81c58b4a62f4fa5fcaad94b219f5d706.zip | |
Update from Gnulib by running admin/merge-gnulib
The following changes were made by hand,
so that admin/merge-gnulib could succeed
instead of failing because the diff didn’t match.
* admin/gnulib-patches/lib/getloadavg.c.diff:
Remove, as it is no longer needed now that recent
Gnulib has been merged.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS):
Remove the --local-dir="$src"admin/gnulib-patches option,
as it is no longer needed either.
Diffstat (limited to 'lib/diffseq.h')
| -rw-r--r-- | lib/diffseq.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/diffseq.h b/lib/diffseq.h index 8a823f98ea0..914bc643bb4 100644 --- a/lib/diffseq.h +++ b/lib/diffseq.h | |||
| @@ -77,6 +77,11 @@ | |||
| 77 | #include "minmax.h" | 77 | #include "minmax.h" |
| 78 | */ | 78 | */ |
| 79 | 79 | ||
| 80 | /* This file uses _GL_GNUC_PREREQ. */ | ||
| 81 | #if !_GL_CONFIG_H_INCLUDED | ||
| 82 | #error "Please include config.h first." | ||
| 83 | #endif | ||
| 84 | |||
| 80 | /* Maximum value of type OFFSET. */ | 85 | /* Maximum value of type OFFSET. */ |
| 81 | #ifndef OFFSET_MAX | 86 | #ifndef OFFSET_MAX |
| 82 | # define OFFSET_MAX \ | 87 | # define OFFSET_MAX \ |
| @@ -93,7 +98,7 @@ | |||
| 93 | #endif | 98 | #endif |
| 94 | 99 | ||
| 95 | /* Suppress gcc's "...may be used before initialized" warnings, | 100 | /* Suppress gcc's "...may be used before initialized" warnings, |
| 96 | generated by GCC versions up to at least GCC 14.2. | 101 | generated by GCC versions up to at least GCC 15.1. |
| 97 | Likewise for gcc -fanalyzer's "use of uninitialized value" warnings. */ | 102 | Likewise for gcc -fanalyzer's "use of uninitialized value" warnings. */ |
| 98 | #if _GL_GNUC_PREREQ (4, 7) | 103 | #if _GL_GNUC_PREREQ (4, 7) |
| 99 | # pragma GCC diagnostic push | 104 | # pragma GCC diagnostic push |