[Emacs-diffs] Changes to emacs/src/lisp.h [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/lisp.h
diff -c emacs/src/lisp.h:1.465.2.15 emacs/src/lisp.h:1.465.2.16
*** emacs/src/lisp.h:1.465.2.15 Fri Nov 19 06:54:57 2004
--- emacs/src/lisp.h    Wed Dec  8 05:02:18 2004
***************
*** 35,40 ****
--- 35,56 ----
     be compared to the sizes recorded in Lisp strings.  */
  
  #define GC_CHECK_STRING_BYTES 1
+ 
+ /* Define this to check for short string overrun.  */
+ 
+ #define GC_CHECK_STRING_OVERRUN 1
+ 
+ /* Define this to check the string free list.  */
+ 
+ #define GC_CHECK_STRING_FREE_LIST 1
+ 
+ /* Define this to check for malloc buffer overrun.  */
+ 
+ #define XMALLOC_OVERRUN_CHECK 1
+ 
+ /* Define this to check for errors in cons list.  */
+ /* #define GC_CHECK_CONS_LIST 1 */
+ 
  #endif /* 0 */
  
  
***************
*** 305,315 ****
  /* First, try and define DECL_ALIGN(type,var) which declares a static
     variable VAR of type TYPE with the added requirement that it be
     TYPEBITS-aligned. */
! #ifndef DECL_ALIGN
  /* What compiler directive should we use for non-gcc compilers?  -stef  */
! # if defined (__GNUC__)
! #  define DECL_ALIGN(type, var) \
!     type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var
  # endif
  #endif
  
--- 321,333 ----
  /* First, try and define DECL_ALIGN(type,var) which declares a static
     variable VAR of type TYPE with the added requirement that it be
     TYPEBITS-aligned. */
! #ifndef NO_DECL_ALIGN
! # ifndef DECL_ALIGN
  /* What compiler directive should we use for non-gcc compilers?  -stef  */
! #  if defined (__GNUC__)
! #   define DECL_ALIGN(type, var) \
!      type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var
! #  endif
  # endif
  #endif
  
***************
*** 324,330 ****
  # endif
  #endif
  
! /* Just remove the alignment annotation if we don't use it.  */
  #ifndef DECL_ALIGN
  # ifdef USE_LSB_TAG
  #  error "USE_LSB_TAG used without defining DECL_ALIGN"
--- 342,348 ----
  # endif
  #endif
  
! /* If we cannot use 8-byte alignment, make DECL_ALIGN a no-op.  */
  #ifndef DECL_ALIGN
  # ifdef USE_LSB_TAG
  #  error "USE_LSB_TAG used without defining DECL_ALIGN"
***************
*** 2325,2330 ****
--- 2343,2349 ----
  extern int string_char_to_byte P_ ((Lisp_Object, int));
  extern int string_byte_to_char P_ ((Lisp_Object, int));
  extern Lisp_Object string_make_multibyte P_ ((Lisp_Object));
+ extern Lisp_Object string_to_multibyte P_ ((Lisp_Object));
  extern Lisp_Object string_make_unibyte P_ ((Lisp_Object));
  EXFUN (Fcopy_alist, 1);
  EXFUN (Fplist_get, 2);
***************
*** 2455,2460 ****
--- 2474,2480 ----
  /* Defined in alloc.c */
  extern void check_pure_size P_ ((void));
  extern void allocate_string_data P_ ((struct Lisp_String *, int, int));
+ extern void reset_malloc_hooks P_ ((void));
  extern void uninterrupt_malloc P_ ((void));
  extern void malloc_warning P_ ((char *));
  extern void memory_full P_ ((void));
***************
*** 2849,2855 ****
  extern Lisp_Object last_minibuf_string;
  extern void choose_minibuf_frame P_ ((void));
  EXFUN (Fcompleting_read, 8);
! EXFUN (Fread_from_minibuffer, 7);
  EXFUN (Fread_variable, 2);
  EXFUN (Fread_buffer, 3);
  EXFUN (Fread_minibuffer, 2);
--- 2869,2875 ----
  extern Lisp_Object last_minibuf_string;
  extern void choose_minibuf_frame P_ ((void));
  EXFUN (Fcompleting_read, 8);
! EXFUN (Fread_from_minibuffer, 8);
  EXFUN (Fread_variable, 2);
  EXFUN (Fread_buffer, 3);
  EXFUN (Fread_minibuffer, 2);