3 files changed, 6 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b656b0e7dc7..9135ce8cbbc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Remove unnecessary alloca.h includes.
+        * keymap.c: Do not include alloca.h, config.h does that.
+        * sysdep.c: Likewise.  Do not define fwrite, not used.
+
 2010-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * sysdep.c (child_setup_tty): Move the non-canonical initialization to
diff --git a/src/keymap.c b/src/keymap.c
index 53b6795d623..c3a9d9e5cc0 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -22,9 +22,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <setjmp.h>
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
 #include "lisp.h"
 #include "commands.h"
 #include "buffer.h"
diff --git a/src/sysdep.c b/src/sysdep.c
index 46169b28e1f..ba2a7493d74 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -36,9 +36,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif /* HAVE_ALLOCA_H */
 
 #include "lisp.h"
 /* Including stdlib.h isn't necessarily enough to get srandom
@@ -61,13 +58,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif /* not WINDOWSNT */
 
-/* Does anyone other than VMS need this? */
-#ifndef fwrite
-#define sys_fwrite fwrite
-#else
-#undef fwrite
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>