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

[Eli Zaretskii]

Index: emacs/src/lisp.h
diff -c emacs/src/lisp.h:1.511 emacs/src/lisp.h:1.512
*** emacs/src/lisp.h:1.511      Sun Nov 21 00:28:02 2004
--- emacs/src/lisp.h    Sat Nov 27 12:24:40 2004
***************
*** 304,314 ****
  /* 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
  
--- 304,316 ----
  /* 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
  
***************
*** 323,329 ****
  # 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"
--- 325,331 ----
  # 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"