diff src/pure.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 2c611d1463a6
children
line wrap: on
line diff
--- a/src/pure.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/pure.c	Mon Aug 13 10:28:48 2007 +0200
@@ -18,25 +18,19 @@
 /* Synched up with: FSF 19.30.  Split out of alloc.c. */
 
 #include <config.h>
+#include "lisp.h"
 #include "puresize.h"
-#include "lisp.h"
 
 /* Moved from puresize.h to here so alloc.c does not get recompiled */
 
 # include <puresize-adjust.h>
 #define PURESIZE ((RAW_PURESIZE) + (PURESIZE_ADJUSTMENT))
 
-long int
-get_PURESIZE(void)
+size_t
+get_PURESIZE (void)
 {
   return PURESIZE;
 }
 
-Lisp_Object pure[PURESIZE / sizeof (Lisp_Object)]
-     /* Force linker to put it into data space! */
-#ifdef NO_UNION_TYPE
-     = {0};
-#else
-     /* Need this many braces to convince GCC not to complain */
-     = {{{0}}};
-#endif
+/* Force linker to put it into data space! */
+EMACS_INT pure[PURESIZE / sizeof (EMACS_INT)] = { (EMACS_INT) 0};