diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-24 17:29:06 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-24 17:34:32 -0700 |
| commit | 41cc2b64904d2f59bdb32f76d898a2a1afb72ec7 (patch) | |
| tree | 935c67898a43a1f3b6648df2724014cd6025ab39 | |
| parent | 4494789d2ca4b24e25fae1b3e97fb9743e9830a4 (diff) | |
| download | emacs-41cc2b64904d2f59bdb32f76d898a2a1afb72ec7.tar.gz | |
Merge from gnulib
| -rwxr-xr-x | build-aux/config.sub | 5 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 1 | ||||
| -rw-r--r-- | lib/str-two-way.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/build-aux/config.sub b/build-aux/config.sub index a44fd8ae908..f53af5a2da7 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1247,7 +1247,8 @@ case $cpu-$vendor in | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ | vax \ | visium \ - | w65 | wasm32 \ + | w65 \ + | wasm32 | wasm64 \ | we32k \ | x86 | x86_64 | xc16x | xgate | xps100 \ | xstormy16 | xtensa* \ @@ -1367,7 +1368,7 @@ case $os in | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten*) + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*) # Remember, each alternative MUST END IN *, to match a version number. ;; qnx*) diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 03160340c8e..ade4ff8ebdb 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -591,6 +591,7 @@ HAVE_OPENAT = @HAVE_OPENAT@ HAVE_OPENDIR = @HAVE_OPENDIR@ HAVE_OS_H = @HAVE_OS_H@ HAVE_PCLOSE = @HAVE_PCLOSE@ +HAVE_PDUMPER = @HAVE_PDUMPER@ HAVE_PIPE = @HAVE_PIPE@ HAVE_PIPE2 = @HAVE_PIPE2@ HAVE_POPEN = @HAVE_POPEN@ diff --git a/lib/str-two-way.h b/lib/str-two-way.h index 9155e6b5607..7078c34bdc7 100644 --- a/lib/str-two-way.h +++ b/lib/str-two-way.h @@ -18,7 +18,7 @@ /* Before including this file, you need to include <config.h> and <string.h>, and define: - RESULT_TYPE A macro that expands to the return type. + RETURN_TYPE A macro that expands to the return type. AVAILABLE(h, h_l, j, n_l) A macro that returns nonzero if there are at least N_L bytes left starting at H[J]. |