# HG changeset patch # User Richard M. Stallman # Date 1039001557 0 # Node ID 88902727534a55b13eb7689a87f548abf84c2c2e # Parent 08f82ce16ede5b76cf6b5c6494a2d61975208551 Whitespace changes. diff -r 08f82ce16ede -r 88902727534a src/alloca.c --- a/src/alloca.c Wed Dec 04 11:19:12 2002 +0000 +++ b/src/alloca.c Wed Dec 04 11:32:37 2002 +0000 @@ -22,19 +22,19 @@ your main control loop, etc. to force garbage collection. */ #ifdef HAVE_CONFIG_H -#include +# include #endif #ifdef HAVE_STRING_H -#include +# include #endif #ifdef HAVE_STDLIB_H -#include +# include #endif #ifdef emacs -#include "lisp.h" -#include "blockinput.h" +# include "lisp.h" +# include "blockinput.h" #endif /* If compiling with GCC 2, this file's not needed. */ @@ -42,44 +42,43 @@ /* If someone has defined alloca as a macro, there must be some other way alloca is supposed to work. */ -#ifndef alloca +# ifndef alloca -#ifdef emacs -#ifdef static +# ifdef emacs +# ifdef static /* actually, only want this if static is defined as "" -- this is for usg, in which emacs must undefine static in order to make unexec workable */ -#ifndef STACK_DIRECTION - #error "Must know STACK_DIRECTION at compile-time" -#endif /* STACK_DIRECTION undefined */ -#endif /* static */ -#endif /* emacs */ +# ifndef STACK_DIRECTION +# error "Must know STACK_DIRECTION at compile-time" +# endif /* STACK_DIRECTION undefined */ +# endif /* static */ +# endif /* emacs */ /* If your stack is a linked list of frames, you have to provide an "address metric" ADDRESS_FUNCTION macro. */ -#if defined (CRAY) && defined (CRAY_STACKSEG_END) +# if defined (CRAY) && defined (CRAY_STACKSEG_END) long i00afunc (); -#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) -#else -#define ADDRESS_FUNCTION(arg) &(arg) -#endif +# define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) +# else +# define ADDRESS_FUNCTION(arg) &(arg) +# endif -#ifdef POINTER_TYPE +# ifdef POINTER_TYPE typedef POINTER_TYPE *pointer; -#else -#if __STDC__ +# else /* not POINTER_TYPE */ +# if __STDC__ typedef void *pointer; -#else +# else /* not __STDC__ */ typedef char *pointer; -#endif /*__STDC__*/ -#endif /*POINTER_TYPE*/ - +# endif /* not __STDC__ */ +# endif /* not POINTER_TYPE */ -#ifndef NULL -#define NULL 0 -#endif +# 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 @@ -91,12 +90,13 @@ Callers below should use malloc. */ -#ifdef emacs -#define malloc xmalloc -#ifdef EMACS_FREE -#define free EMACS_FREE -#endif -#endif +# ifndef 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 @@ -107,18 +107,18 @@ STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ -#ifndef STACK_DIRECTION -#define STACK_DIRECTION 0 /* Direction unknown. */ -#endif +# ifndef STACK_DIRECTION +# define STACK_DIRECTION 0 /* Direction unknown. */ +# endif -#if STACK_DIRECTION != 0 +# if STACK_DIRECTION != 0 -#define STACK_DIR STACK_DIRECTION /* Known at compile-time. */ +# define STACK_DIR STACK_DIRECTION /* Known at compile-time. */ -#else /* STACK_DIRECTION == 0; need run-time code. */ +# else /* STACK_DIRECTION == 0; need run-time code. */ static int stack_dir; /* 1 or -1 once known. */ -#define STACK_DIR stack_dir +# define STACK_DIR stack_dir static void find_stack_direction () @@ -142,7 +142,7 @@ } } -#endif /* STACK_DIRECTION == 0 */ +# endif /* STACK_DIRECTION == 0 */ /* An "alloca header" is used to: (a) chain together all alloca'ed blocks; @@ -151,9 +151,9 @@ It is very important that sizeof(header) agree with malloc alignment chunk size. The following default should work okay. */ -#ifndef ALIGN_SIZE -#define ALIGN_SIZE sizeof(double) -#endif +# ifndef ALIGN_SIZE +# define ALIGN_SIZE sizeof(double) +# endif typedef union hdr { @@ -181,10 +181,10 @@ auto char probe; /* Probes stack depth: */ register char *depth = ADDRESS_FUNCTION (probe); -#if STACK_DIRECTION == 0 +# if STACK_DIRECTION == 0 if (STACK_DIR == 0) /* Unknown growth direction. */ find_stack_direction (); -#endif +# endif /* Reclaim garbage, defined as all alloca'd storage that was allocated from deeper in the stack than currently. */ @@ -192,9 +192,9 @@ { register header *hp; /* Traverses linked list. */ -#ifdef emacs +# ifdef emacs BLOCK_INPUT; -#endif +# endif for (hp = last_alloca_header; hp != NULL;) if ((STACK_DIR > 0 && hp->h.deep > depth) @@ -211,9 +211,9 @@ last_alloca_header = hp; /* -> last valid storage. */ -#ifdef emacs +# ifdef emacs UNBLOCK_INPUT; -#endif +# endif } if (size == 0) @@ -239,15 +239,15 @@ } } -#if defined (CRAY) && defined (CRAY_STACKSEG_END) +# if defined (CRAY) && defined (CRAY_STACKSEG_END) -#ifdef DEBUG_I00AFUNC -#include -#endif +# ifdef DEBUG_I00AFUNC +# include +# endif -#ifndef CRAY_STACK -#define CRAY_STACK -#ifndef CRAY2 +# ifndef CRAY_STACK +# define CRAY_STACK +# ifndef CRAY2 /* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */ struct stack_control_header { @@ -299,7 +299,7 @@ long sss7; }; -#else /* CRAY2 */ +# else /* CRAY2 */ /* The following structure defines the vector of words returned by the STKSTAT library routine. */ struct stk_stat @@ -352,10 +352,10 @@ long unknown14; }; -#endif /* CRAY2 */ -#endif /* not CRAY_STACK */ +# endif /* CRAY2 */ +# endif /* not CRAY_STACK */ -#ifdef CRAY2 +# ifdef CRAY2 /* Determine a "stack measure" for an arbitrary ADDRESS. I doubt that "lint" will like this much. */ @@ -426,7 +426,7 @@ return (result); } -#else /* not CRAY2 */ +# else /* not CRAY2 */ /* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP. Determine the number of the cell within the stack, given the address of the cell. The purpose of this @@ -471,9 +471,9 @@ while (!(this_segment <= address && address <= stkl)) { -#ifdef DEBUG_I00AFUNC +# ifdef DEBUG_I00AFUNC fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl); -#endif +# endif if (pseg == 0) break; stkl = stkl - pseg; @@ -492,9 +492,9 @@ while (pseg != 0) { -#ifdef DEBUG_I00AFUNC +# ifdef DEBUG_I00AFUNC fprintf (stderr, "%011o %011o\n", pseg, size); -#endif +# endif stkl = stkl - pseg; ssptr = (struct stack_segment_linkage *) stkl; size = ssptr->sssize; @@ -504,8 +504,8 @@ return (result); } -#endif /* not CRAY2 */ -#endif /* CRAY */ +# endif /* not CRAY2 */ +# endif /* CRAY */ -#endif /* no alloca */ +# endif /* no alloca */ #endif /* not GCC version 2 */