update.

[chise/xemacs-chise.git.1] / src / alloca.c

diff --git a/src/alloca.c b/src/alloca.c
index d2f7f0c..500327f 100644 (file)
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -23,7 +23,7 @@
 
 /* Synched up with: FSF 19.30. */
 
-/* Authorsip:
+/* Authorship:
 
    FSF: A long time ago.
    Very few changes for XEmacs.
@@ -86,7 +86,7 @@ void xfree (pointer);
 # endif
 #endif
 
-#ifndef WINDOWSNT
+#ifndef NULL
 #define        NULL    0
 #endif
 
@@ -100,10 +100,10 @@ void xfree (pointer);
 
    Callers below should use malloc.  */
 
-#ifndef emacs
+#ifdef emacs
 #define malloc xmalloc
 #endif
-#ifndef WINDOWSNT
+#ifndef WIN32_NATIVE
 extern pointer malloc ();
 #else
 extern void *malloc();
@@ -193,7 +193,7 @@ alloca (size)
      unsigned size;
 {
   auto char probe;             /* Probes stack depth: */
-  REGISTER char *depth = ADDRESS_FUNCTION (probe);
+  register char *depth = ADDRESS_FUNCTION (probe);
 
 #if STACK_DIRECTION == 0
   if (STACK_DIR == 0)          /* Unknown growth direction.  */
@@ -204,13 +204,13 @@ alloca (size)
      was allocated from deeper in the stack than currently. */
 
   {
-    REGISTER header *hp;       /* Traverses linked list.  */
+    register header *hp;       /* Traverses linked list.  */
 
     for (hp = last_alloca_header; hp != NULL;)
       if ((STACK_DIR > 0 && hp->h.deep > depth)
          || (STACK_DIR < 0 && hp->h.deep < depth))
        {
-         REGISTER header *np = hp->h.next;
+         register header *np = hp->h.next;
 
          free ((pointer) hp);  /* Collect garbage.  */
 
@@ -228,7 +228,7 @@ alloca (size)
   /* Allocate combined header + user data storage.  */
 
   {
-    REGISTER pointer new = malloc (sizeof (header) + size);
+    register pointer new = malloc (sizeof (header) + size);
     /* Address of header.  */
 
     ((header *) new)->h.next = last_alloca_header;
@@ -387,7 +387,7 @@ i00afunc (long *address)
      a fatal error if "trailer" is null.  */
 
   if (trailer == 0)
-    abort ();
+    ABORT ();
 
   /* Discard segments that do not contain our argument address.  */
 
@@ -396,7 +396,7 @@ i00afunc (long *address)
       block = (long *) trailer->this_address;
       size = trailer->this_size;
       if (block == 0 || size == 0)
-       abort ();
+       ABORT ();
       trailer = (struct stk_trailer *) trailer->link;
       if ((block <= address) && (address < (block + size)))
        break;
@@ -415,7 +415,7 @@ i00afunc (long *address)
   do
     {
       if (trailer->this_size <= 0)
-       abort ();
+       ABORT ();
       result += trailer->this_size;
       trailer = (struct stk_trailer *) trailer->link;
     }