diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-25 09:17:02 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-25 09:17:50 -0800 |
commit | f5b9c1e59653ac687806f6f84181fc3f5020e6ba (patch) | |
tree | 316a0b30906c467aed07e031d6108cba194a5636 /src/termhooks.h | |
parent | e5ef59b87da5c2ddfa22f7342efe29b3eea6ed97 (diff) | |
download | emacs-f5b9c1e59653ac687806f6f84181fc3f5020e6ba.tar.gz |
Reorder lisp.h to declare types before using them
This puts basic functions for types to be after the corresponding
type definitions. This is a more-common programming style in C,
and will make it easier to port Emacs to gcc
-fcheck-pointer-bounds, since the functions now have access to the
corresponding types' sizes. This patch does not change the code;
it just moves declarations and definitions and removes
no-longer-needed forward declarations (Bug#25128).
* src/buffer.c, src/data.c, src/image.c:
Include process.h, for PROCESSP.
* src/buffer.h (BUFFERP, CHECK_BUFFER, XBUFFER):
* src/process.h (PROCESSP, CHECK_PROCESS, XPROCESS):
* src/termhooks.h (TERMINALP, XTERMINAL):
* src/window.h (WINDOWP, CHECK_WINDOW, XWINDOW):
* src/thread.h (THREADP, CHECK_THREAD, XTHREAD, MUTEXP, CHECK_MUTEX)
(XMUTEX, CONDVARP, CHECK_CONDVAR, XCONDVAR):
Move here from lisp.h.
* src/intervals.h: Include buffer.h, for BUFFERP.
Include lisp.h, for Lisp_Object.
* src/lisp.h: Reorder declarations and definitions as described
above. Move thread includes to be later, so that they can use the
reordered definitions. Move some symbols to other headers (noted
elsewhere). Remove forward decls that are no longer needed.
* src/thread.h: Include systhread.h here, not in lisp.h,
since lisp.h itself does not need systhread.h.
Diffstat (limited to 'src/termhooks.h')
-rw-r--r-- | src/termhooks.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 03416cb8842..81e06d9c368 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -654,6 +654,19 @@ struct terminal void (*delete_terminal_hook) (struct terminal *); }; +INLINE bool +TERMINALP (Lisp_Object a) +{ + return PSEUDOVECTORP (a, PVEC_TERMINAL); +} + +INLINE struct terminal * +XTERMINAL (Lisp_Object a) +{ + eassert (TERMINALP (a)); + return XUNTAG (a, Lisp_Vectorlike); +} + /* Most code should use these functions to set Lisp fields in struct terminal. */ INLINE void |