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

[Richard M . Stallman]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.341 emacs/src/alloc.c:1.342
*** emacs/src/alloc.c:1.341     Sat May 29 00:00:17 2004
--- emacs/src/alloc.c   Sat May 29 16:10:27 2004
***************
*** 754,770 ****
  #ifdef HAVE_POSIX_MEMALIGN
        {
        int err = posix_memalign (&base, BLOCK_ALIGN, ABLOCKS_BYTES);
!       abase = err ? (base = NULL) : base;
        }
  #else
        base = malloc (ABLOCKS_BYTES);
        abase = ALIGN (base, BLOCK_ALIGN);
        if (base == 0)
        {
          UNBLOCK_INPUT;
          memory_full ();
        }
- #endif
  
        aligned = (base == abase);
        if (!aligned)
--- 754,773 ----
  #ifdef HAVE_POSIX_MEMALIGN
        {
        int err = posix_memalign (&base, BLOCK_ALIGN, ABLOCKS_BYTES);
!       if (err)
!         base = NULL;
!       abase = base;
        }
  #else
        base = malloc (ABLOCKS_BYTES);
        abase = ALIGN (base, BLOCK_ALIGN);
+ #endif
+ 
        if (base == 0)
        {
          UNBLOCK_INPUT;
          memory_full ();
        }
  
        aligned = (base == abase);
        if (!aligned)