diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-10-04 12:11:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-10-04 15:21:31 -0700 |
| commit | 68a256c89270ef9e97bca6097967a9ed2b050f4a (patch) | |
| tree | 7a3cca947c133bf7def967083f1054dfa4239322 /oldXMenu | |
| parent | 63cb65dccecb1146cdad7134e4b62ea3e1433880 (diff) | |
| download | emacs-68a256c89270ef9e97bca6097967a9ed2b050f4a.tar.gz emacs-68a256c89270ef9e97bca6097967a9ed2b050f4a.tar.bz2 emacs-68a256c89270ef9e97bca6097967a9ed2b050f4a.zip | |
Update from Gnulib
Make the following changes by hand, and run 'admin/merge-gnulib'.
* .gitignore: Add lib/malloc/*.gl.h.
* admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h
directly from Gnulib, without worrying about Gnulib modules,
as these files are special cases.
(AVOIDED_MODULES): Remove malloc-posix.
* lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4:
* m4/year2038.m4: New files, copied from Gnulib.
* lib/malloca.c, lib/malloca.h:
* m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4:
Remove. These are either no longer present in Gnulib, or are no
longer needed by modules that Emacs uses.
* oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first;
needed for new Gnulib.
* src/xmenu.c: Call emacs_abort, not abort.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/AddPane.c | 2 | ||||
| -rw-r--r-- | oldXMenu/AddSel.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c index b14b3e82e4e..8616de804f4 100644 --- a/oldXMenu/AddPane.c +++ b/oldXMenu/AddPane.c @@ -30,8 +30,8 @@ without express or implied warranty. * */ -#include <string.h> #include "XMenuInt.h" +#include <string.h> int XMenuAddPane(Display *display, register XMenu *menu, register char const *label, int active) diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c index 9596caed0e7..d81c54b8707 100644 --- a/oldXMenu/AddSel.c +++ b/oldXMenu/AddSel.c @@ -31,8 +31,8 @@ without express or implied warranty. * */ -#include <string.h> #include "XMenuInt.h" +#include <string.h> int XMenuAddSelection(Display *display, register XMenu *menu, register int p_num, char *data, char *label, int active, char const *help) |