diff options
| author | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-09-09 03:06:52 +0200 |
| commit | 5e617bc2b62189768814fafd1a875e89a094d3ef (patch) | |
| tree | d96d22e012035d044557abf4de0b8e30b03d61b7 /src/lisp.h | |
| parent | 9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff) | |
| download | emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip | |
Whitespace changes.
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/lisp.h b/src/lisp.h index 5c84bb8e06e..1f297d51596 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -132,9 +132,9 @@ extern int suppress_checking EXTERNALLY_VISIBLE; | |||
| 132 | #define eassert(X) ((void) (0 && (X))) /* Check that X compiles. */ | 132 | #define eassert(X) ((void) (0 && (X))) /* Check that X compiles. */ |
| 133 | #else /* ENABLE_CHECKING */ | 133 | #else /* ENABLE_CHECKING */ |
| 134 | #if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__) | 134 | #if defined (__GNUC__) && __GNUC__ >= 2 && defined (__STDC__) |
| 135 | #define eassert(cond) CHECK(cond,"assertion failed: " #cond) | 135 | #define eassert(cond) CHECK (cond, "assertion failed: " #cond) |
| 136 | #else | 136 | #else |
| 137 | #define eassert(cond) CHECK(cond,"assertion failed") | 137 | #define eassert(cond) CHECK (cond, "assertion failed") |
| 138 | #endif | 138 | #endif |
| 139 | #endif /* ENABLE_CHECKING */ | 139 | #endif /* ENABLE_CHECKING */ |
| 140 | 140 | ||
| @@ -584,20 +584,20 @@ extern Lisp_Object make_number (EMACS_INT); | |||
| 584 | 584 | ||
| 585 | /* Extract a value or address from a Lisp_Object. */ | 585 | /* Extract a value or address from a Lisp_Object. */ |
| 586 | 586 | ||
| 587 | #define XCONS(a) (eassert (CONSP(a)),(struct Lisp_Cons *) XPNTR(a)) | 587 | #define XCONS(a) (eassert (CONSP (a)), (struct Lisp_Cons *) XPNTR (a)) |
| 588 | #define XVECTOR(a) (eassert (VECTORLIKEP(a)),(struct Lisp_Vector *) XPNTR(a)) | 588 | #define XVECTOR(a) (eassert (VECTORLIKEP (a)), (struct Lisp_Vector *) XPNTR (a)) |
| 589 | #define XSTRING(a) (eassert (STRINGP(a)),(struct Lisp_String *) XPNTR(a)) | 589 | #define XSTRING(a) (eassert (STRINGP (a)), (struct Lisp_String *) XPNTR (a)) |
| 590 | #define XSYMBOL(a) (eassert (SYMBOLP(a)),(struct Lisp_Symbol *) XPNTR(a)) | 590 | #define XSYMBOL(a) (eassert (SYMBOLP (a)), (struct Lisp_Symbol *) XPNTR (a)) |
| 591 | #define XFLOAT(a) (eassert (FLOATP(a)),(struct Lisp_Float *) XPNTR(a)) | 591 | #define XFLOAT(a) (eassert (FLOATP (a)), (struct Lisp_Float *) XPNTR (a)) |
| 592 | 592 | ||
| 593 | /* Misc types. */ | 593 | /* Misc types. */ |
| 594 | 594 | ||
| 595 | #define XMISC(a) ((union Lisp_Misc *) XPNTR(a)) | 595 | #define XMISC(a) ((union Lisp_Misc *) XPNTR (a)) |
| 596 | #define XMISCANY(a) (eassert (MISCP (a)), &(XMISC(a)->u_any)) | 596 | #define XMISCANY(a) (eassert (MISCP (a)), &(XMISC (a)->u_any)) |
| 597 | #define XMISCTYPE(a) (XMISCANY (a)->type) | 597 | #define XMISCTYPE(a) (XMISCANY (a)->type) |
| 598 | #define XMARKER(a) (eassert (MARKERP (a)), &(XMISC(a)->u_marker)) | 598 | #define XMARKER(a) (eassert (MARKERP (a)), &(XMISC (a)->u_marker)) |
| 599 | #define XOVERLAY(a) (eassert (OVERLAYP (a)), &(XMISC(a)->u_overlay)) | 599 | #define XOVERLAY(a) (eassert (OVERLAYP (a)), &(XMISC (a)->u_overlay)) |
| 600 | #define XSAVE_VALUE(a) (eassert (SAVE_VALUEP (a)), &(XMISC(a)->u_save_value)) | 600 | #define XSAVE_VALUE(a) (eassert (SAVE_VALUEP (a)), &(XMISC (a)->u_save_value)) |
| 601 | 601 | ||
| 602 | /* Forwarding object types. */ | 602 | /* Forwarding object types. */ |
| 603 | 603 | ||
| @@ -612,14 +612,14 @@ extern Lisp_Object make_number (EMACS_INT); | |||
| 612 | 612 | ||
| 613 | /* Pseudovector types. */ | 613 | /* Pseudovector types. */ |
| 614 | 614 | ||
| 615 | #define XPROCESS(a) (eassert (PROCESSP(a)),(struct Lisp_Process *) XPNTR(a)) | 615 | #define XPROCESS(a) (eassert (PROCESSP (a)), (struct Lisp_Process *) XPNTR (a)) |
| 616 | #define XWINDOW(a) (eassert (WINDOWP(a)),(struct window *) XPNTR(a)) | 616 | #define XWINDOW(a) (eassert (WINDOWP (a)), (struct window *) XPNTR (a)) |
| 617 | #define XTERMINAL(a) (eassert (TERMINALP(a)),(struct terminal *) XPNTR(a)) | 617 | #define XTERMINAL(a) (eassert (TERMINALP (a)), (struct terminal *) XPNTR (a)) |
| 618 | #define XSUBR(a) (eassert (SUBRP(a)),(struct Lisp_Subr *) XPNTR(a)) | 618 | #define XSUBR(a) (eassert (SUBRP (a)), (struct Lisp_Subr *) XPNTR (a)) |
| 619 | #define XBUFFER(a) (eassert (BUFFERP(a)),(struct buffer *) XPNTR(a)) | 619 | #define XBUFFER(a) (eassert (BUFFERP (a)), (struct buffer *) XPNTR (a)) |
| 620 | #define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *) XPNTR(a)) | 620 | #define XCHAR_TABLE(a) (eassert (CHAR_TABLE_P (a)), (struct Lisp_Char_Table *) XPNTR (a)) |
| 621 | #define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct Lisp_Sub_Char_Table *) XPNTR(a)) | 621 | #define XSUB_CHAR_TABLE(a) (eassert (SUB_CHAR_TABLE_P (a)), (struct Lisp_Sub_Char_Table *) XPNTR (a)) |
| 622 | #define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector *) XPNTR(a)) | 622 | #define XBOOL_VECTOR(a) (eassert (BOOL_VECTOR_P (a)), (struct Lisp_Bool_Vector *) XPNTR (a)) |
| 623 | 623 | ||
| 624 | /* Construct a Lisp_Object from a value or address. */ | 624 | /* Construct a Lisp_Object from a value or address. */ |
| 625 | 625 | ||
| @@ -637,7 +637,7 @@ extern Lisp_Object make_number (EMACS_INT); | |||
| 637 | 637 | ||
| 638 | /* Pseudovector types. */ | 638 | /* Pseudovector types. */ |
| 639 | 639 | ||
| 640 | #define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE(v, header.size, code) | 640 | #define XSETPVECTYPE(v, code) XSETTYPED_PVECTYPE (v, header.size, code) |
| 641 | #define XSETTYPED_PVECTYPE(v, size_member, code) \ | 641 | #define XSETTYPED_PVECTYPE(v, size_member, code) \ |
| 642 | ((v)->size_member |= PSEUDOVECTOR_FLAG | (code)) | 642 | ((v)->size_member |= PSEUDOVECTOR_FLAG | (code)) |
| 643 | #define XSETPVECTYPESIZE(v, code, sizeval) \ | 643 | #define XSETPVECTYPESIZE(v, code, sizeval) \ |
| @@ -749,8 +749,8 @@ struct Lisp_Cons | |||
| 749 | #endif | 749 | #endif |
| 750 | 750 | ||
| 751 | /* Use these from normal code. */ | 751 | /* Use these from normal code. */ |
| 752 | #define XCAR(c) LISP_MAKE_RVALUE(XCAR_AS_LVALUE(c)) | 752 | #define XCAR(c) LISP_MAKE_RVALUE (XCAR_AS_LVALUE (c)) |
| 753 | #define XCDR(c) LISP_MAKE_RVALUE(XCDR_AS_LVALUE(c)) | 753 | #define XCDR(c) LISP_MAKE_RVALUE (XCDR_AS_LVALUE (c)) |
| 754 | 754 | ||
| 755 | /* Use these to set the fields of a cons cell. | 755 | /* Use these to set the fields of a cons cell. |
| 756 | 756 | ||
| @@ -758,8 +758,8 @@ struct Lisp_Cons | |||
| 758 | should not be read after 'c' is first modified. Also, neither | 758 | should not be read after 'c' is first modified. Also, neither |
| 759 | argument should be evaluated more than once; side effects are | 759 | argument should be evaluated more than once; side effects are |
| 760 | especially common in the second argument. */ | 760 | especially common in the second argument. */ |
| 761 | #define XSETCAR(c,n) (XCAR_AS_LVALUE(c) = (n)) | 761 | #define XSETCAR(c,n) (XCAR_AS_LVALUE (c) = (n)) |
| 762 | #define XSETCDR(c,n) (XCDR_AS_LVALUE(c) = (n)) | 762 | #define XSETCDR(c,n) (XCDR_AS_LVALUE (c) = (n)) |
| 763 | 763 | ||
| 764 | /* Take the car or cdr of something whose type is not known. */ | 764 | /* Take the car or cdr of something whose type is not known. */ |
| 765 | #define CAR(c) \ | 765 | #define CAR(c) \ |
| @@ -872,14 +872,14 @@ struct Lisp_Vector | |||
| 872 | of the shortest vector that would hold that struct. */ | 872 | of the shortest vector that would hold that struct. */ |
| 873 | #define VECSIZE(type) ((sizeof (type) \ | 873 | #define VECSIZE(type) ((sizeof (type) \ |
| 874 | - offsetof (struct Lisp_Vector, contents[0]) \ | 874 | - offsetof (struct Lisp_Vector, contents[0]) \ |
| 875 | + sizeof(Lisp_Object) - 1) /* round up */ \ | 875 | + sizeof (Lisp_Object) - 1) /* round up */ \ |
| 876 | / sizeof (Lisp_Object)) | 876 | / sizeof (Lisp_Object)) |
| 877 | 877 | ||
| 878 | /* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields | 878 | /* Like VECSIZE, but used when the pseudo-vector has non-Lisp_Object fields |
| 879 | at the end and we need to compute the number of Lisp_Object fields (the | 879 | at the end and we need to compute the number of Lisp_Object fields (the |
| 880 | ones that the GC needs to trace). */ | 880 | ones that the GC needs to trace). */ |
| 881 | #define PSEUDOVECSIZE(type, nonlispfield) \ | 881 | #define PSEUDOVECSIZE(type, nonlispfield) \ |
| 882 | ((offsetof(type, nonlispfield) - offsetof(struct Lisp_Vector, contents[0])) \ | 882 | ((offsetof (type, nonlispfield) - offsetof (struct Lisp_Vector, contents[0])) \ |
| 883 | / sizeof (Lisp_Object)) | 883 | / sizeof (Lisp_Object)) |
| 884 | 884 | ||
| 885 | /* A char-table is a kind of vectorlike, with contents are like a | 885 | /* A char-table is a kind of vectorlike, with contents are like a |
| @@ -3296,7 +3296,7 @@ extern void syms_of_frame (void); | |||
| 3296 | /* Defined in emacs.c */ | 3296 | /* Defined in emacs.c */ |
| 3297 | extern char **initial_argv; | 3297 | extern char **initial_argv; |
| 3298 | extern int initial_argc; | 3298 | extern int initial_argc; |
| 3299 | #if defined(HAVE_X_WINDOWS) || defined(HAVE_NS) | 3299 | #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS) |
| 3300 | extern int display_arg; | 3300 | extern int display_arg; |
| 3301 | #endif | 3301 | #endif |
| 3302 | extern Lisp_Object decode_env_path (const char *, const char *); | 3302 | extern Lisp_Object decode_env_path (const char *, const char *); |
| @@ -3642,7 +3642,7 @@ extern void init_system_name (void); | |||
| 3642 | /* We used to use `abs', but that clashes with system headers on some | 3642 | /* We used to use `abs', but that clashes with system headers on some |
| 3643 | platforms, and using a name reserved by Standard C is a bad idea | 3643 | platforms, and using a name reserved by Standard C is a bad idea |
| 3644 | anyway. */ | 3644 | anyway. */ |
| 3645 | #if !defined(eabs) | 3645 | #if !defined (eabs) |
| 3646 | #define eabs(x) ((x) < 0 ? -(x) : (x)) | 3646 | #define eabs(x) ((x) < 0 ? -(x) : (x)) |
| 3647 | #endif | 3647 | #endif |
| 3648 | 3648 | ||