aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-08-25 20:44:27 +0300
committerEli Zaretskii2014-08-25 20:44:27 +0300
commit825ca47f5a17cc172b23f8913a33d6721f96f0ed (patch)
tree833cf2827f401e5a3bbbaaef2fcb70f492767c9d /src
parent20a4f6a967dc864b1fb5428a3f358246f5ab67f8 (diff)
downloademacs-825ca47f5a17cc172b23f8913a33d6721f96f0ed.tar.gz
emacs-825ca47f5a17cc172b23f8913a33d6721f96f0ed.zip
Fix unoptimized build on MSDOS.
msdos/sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan Manuel Guerrero <juan.guerrero@gmx.de>. src/conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/conf_post.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c774468e5e..8ca95025019 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-08-25 Eli Zaretskii <eliz@gnu.org>
2
3 * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.
4
12014-08-18 Eli Zaretskii <eliz@gnu.org> 52014-08-18 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (handle_stop): Improve commentary. 7 * xdisp.c (handle_stop): Improve commentary.
diff --git a/src/conf_post.h b/src/conf_post.h
index 446c8275613..386d83f4b1f 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -126,13 +126,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
126 so we could reuse it in readlinkat; see msdos.c. */ 126 so we could reuse it in readlinkat; see msdos.c. */
127#define opendir sys_opendir 127#define opendir sys_opendir
128 128
129/* The "portable" definition of _GL_INLINE on config.h does not work
130 with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c,
131 although lib/execinfo.h is included and the inline functions there
132 are visible. */
133#if __GNUC__ < 4
134# define _GL_EXECINFO_INLINE inline
135#endif
136/* End of gnulib-related stuff. */ 129/* End of gnulib-related stuff. */
137 130
138#define emacs_raise(sig) msdos_fatal_signal (sig) 131#define emacs_raise(sig) msdos_fatal_signal (sig)