merge from upstream. currently seems to have bitroted and i get segfaults

1 files changed, 1 insertions, 6 deletions

diff --git a/src/ralloc.c b/src/ralloc.c
index 5f2b52fcc4b..ee8493b89a4 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1,6 +1,5 @@
 /* Block-relocating memory allocator.
-   Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2000-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -30,9 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"               /* Needed for VALBITS.  */
 #include "blockinput.h"
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 typedef POINTER_TYPE *POINTER;
 typedef size_t SIZE;
@@ -1263,5 +1260,3 @@ r_alloc_init (void)
   use_relocatable_buffers = 1;
 }
 
-/* arch-tag: 6a524a15-faff-44c8-95d4-a5da6f55110f
-   (do not change this comment) */