[Emacs-diffs] Changes to emacs/src/alloca.c

[Dave Love]

Index: emacs/src/alloca.c
diff -c emacs/src/alloca.c:1.26 emacs/src/alloca.c:1.27
*** emacs/src/alloca.c:1.26     Thu Jun 12 18:09:14 2003
--- emacs/src/alloca.c  Wed Aug 20 12:47:48 2003
***************
*** 36,42 ****
  #endif
  
  #ifdef DO_BLOCK_INPUT
- # include "lisp.h"
  # include "blockinput.h"
  #endif
  
--- 36,41 ----
***************
*** 58,64 ****
  lose
  -- must know STACK_DIRECTION at compile-time
  /* Using #error here is not wise since this file should work for
!    old and obscure compilers.  */
  #    endif /* STACK_DIRECTION undefined */
  #   endif /* static */
  #  endif /* emacs */
--- 57,66 ----
  lose
  -- must know STACK_DIRECTION at compile-time
  /* Using #error here is not wise since this file should work for
!    old and obscure compilers.  
! 
!    As far as I know, using it is OK if it's indented -- at least for
!    pcc-based processors.  -- fx */
  #    endif /* STACK_DIRECTION undefined */
  #   endif /* static */
  #  endif /* emacs */
***************
*** 73,110 ****
  #   define ADDRESS_FUNCTION(arg) &(arg)
  #  endif
  
! #  ifdef POINTER_TYPE
  typedef POINTER_TYPE *pointer;
- #  else /* not POINTER_TYPE */
- #   if __STDC__
- typedef void *pointer;
- #   else /* not __STDC__ */
- typedef char *pointer;
- #   endif /* not __STDC__ */
- #  endif /* not POINTER_TYPE */
  
  #  ifndef NULL
  #   define NULL 0
  #  endif
  
! /* Different portions of Emacs need to call different versions of
!    malloc.  The Emacs executable needs alloca to call xmalloc, because
!    ordinary malloc isn't protected from input signals.  On the other
!    hand, the utilities in lib-src need alloca to call malloc; some of
!    them are very simple, and don't have an xmalloc routine.
! 
!    Non-Emacs programs expect this to call xmalloc.
  
     Callers below should use malloc.  */
  
! #  ifdef emacs
! #   undef malloc
! #   define malloc xmalloc
! #   ifdef EMACS_FREE
! #    define free EMACS_FREE
! #   endif
! #  endif
! extern pointer malloc ();
  
  /* Define STACK_DIRECTION if you know the direction of stack
     growth for your system; otherwise it will be automatically
--- 75,106 ----
  #   define ADDRESS_FUNCTION(arg) &(arg)
  #  endif
  
! #  ifndef POINTER_TYPE
! #   ifdef __STDC__
! #    define POINTER_TYPE void
! #   else
! #    define POINTER_TYPE char
! #   endif
! #  endif
  typedef POINTER_TYPE *pointer;
  
  #  ifndef NULL
  #   define NULL 0
  #  endif
  
! /* The Emacs executable needs alloca to call xmalloc, because ordinary
!    malloc isn't protected from input signals.  xmalloc also checks for
!    out-of-memory errors, so we should use it generally.
  
     Callers below should use malloc.  */
  
! #  undef malloc
! #  define malloc xmalloc
! #  undef free
! #  define free xfree
! 
! void *xmalloc _P ((size_t));
! void xfree _P ((void *))
  
  /* Define STACK_DIRECTION if you know the direction of stack
     growth for your system; otherwise it will be automatically
***************
*** 229,236 ****
    /* Allocate combined header + user data storage.  */
  
    {
-     register pointer new = malloc (sizeof (header) + size);
      /* Address of header.  */
  
      if (new == 0)
        abort();
--- 225,232 ----
    /* Allocate combined header + user data storage.  */
  
    {
      /* Address of header.  */
+     register pointer new = malloc (sizeof (header) + size);
  
      if (new == 0)
        abort();