diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-09-07 20:04:19 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-09-07 20:04:19 +0300 |
| commit | 970d21e8e6aa7e5bafd3f025f66d694b5ae06ba5 (patch) | |
| tree | 690c29d0085614634903845e267a6fd6c9721818 /src/font.c | |
| parent | 2b95a8efed84d6ec8f178a3bfbbcbfdee3ab35ef (diff) | |
| download | emacs-970d21e8e6aa7e5bafd3f025f66d694b5ae06ba5.tar.gz | |
Fix the MS-Windows build broken by SAFE_ALLOCA changes.
src/callproc.c (child_setup) [WINDOWSNT]: Don't call exec_failed if
'alloca' gets passed arguments larger than MAX_ALLOCA.
src/font.c (MAX): Define if not defined elsewhere.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/font.c b/src/font.c index 90a5c6a2f88..46fc51bd5ad 100644 --- a/src/font.c +++ b/src/font.c @@ -41,6 +41,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ +#ifndef MAX +# define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif + Lisp_Object Qopentype; /* Important character set strings. */ |