diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/watch.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 1dfe2e39a..db166f7ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-11-15 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> + + * 49563: Src/Modules/watch.c: fix build problem of watch module + on Cygwin + 2021-11-12 Oliver Kiddle <opk@zsh.org> * github #82: Dimitris Apostolou: Completion/BSD/Command/_kdump, diff --git a/Src/Modules/watch.c b/Src/Modules/watch.c index 5ce604c63..95d591a67 100644 --- a/Src/Modules/watch.c +++ b/Src/Modules/watch.c @@ -640,8 +640,8 @@ static struct builtin bintab[] = { }; static struct paramdef partab[] = { - PARAMDEF("WATCH", PM_SCALAR|PM_SPECIAL, &watch, &colonarr_gsu), - PARAMDEF("watch", PM_ARRAY|PM_SPECIAL, &watch, &vararray_gsu), + PARAMDEF("WATCH", PM_SCALAR|PM_SPECIAL, &watch, NULL), + PARAMDEF("watch", PM_ARRAY|PM_SPECIAL, &watch, NULL), }; static struct features module_features = { @@ -656,6 +656,10 @@ static struct features module_features = { int setup_(UNUSED(Module m)) { + /* On Cygwin, colonarr_gsu exists in libzsh.dll and we can't + * use &colonarr_gsu in the initialization of partab[] above */ + partab[0].gsu = (void *)&colonarr_gsu; + partab[1].gsu = (void *)&vararray_gsu; return 0; } |