X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Falloca.c;h=e3ba02e27d617116e1b154f0ee8a141a42f6e82f;hb=15fd1e6e063e07e811ab9d9e4611682baa4df555;hp=d2f7f0c086d082acf8eddd8c1e84738692207481;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git diff --git a/src/alloca.c b/src/alloca.c index d2f7f0c..e3ba02e 100644 --- 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;