diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-10-16 14:54:09 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-10-16 14:56:11 -0700 |
commit | 55ba8c022b493b494bea257e4f523758154e0fdd (patch) | |
tree | 3e65647197e08099f62815c99cf2bcffa4444b77 /src/category.h | |
parent | 1e1a326c0f609f403c625bd9082e1099a4d9a52a (diff) | |
download | emacs-55ba8c022b493b494bea257e4f523758154e0fdd.tar.gz |
Make src headers idempotent and standalone
Redo src/*.h so that each include file is idempotent (that is, can
be included multiple times with the latter inclusions having no
effect) and standalone (that is, can be included by itself,
with no include file other than config.h needed as a prerequisite).
This is standard practice in GNU programs nowadays.
* lwlib/lwlib-widget.h, src/buffer.h, src/category.h, src/character.h:
* src/charset.h, src/coding.h, src/commands.h, src/disptab.h:
* src/fontset.h, src/gnutls.h, src/indent.h, src/keymap.h, src/macros.h:
* src/regex.h [emacs]:
* src/syntax.h, src/systty.h, src/termhooks.h:
Include lisp.h, for Lisp_Object.
* src/buffer.h, src/category.h, src/cm.h, src/commands.h, src/disptab.h:
* src/indent.h, src/intervals.h, src/keyboard.h, src/macros.h:
* src/process.h, src/puresize.h, src/region-cache.h, src/syntax.h:
* src/syssignal.h, src/sysstdio.h, src/systty.h, src/termchar.h:
* src/termopts.h, src/tparam.h, src/unexec.h:
Protect against multiple inclusion.
* src/buffer.h: Include character.h, for STRING_CHAR.
* src/emacsgtkfixed.h (struct frame):
* src/fontset.h (struct face):
* src/region-cache.h (struct buffer):
* src/termhooks.h (struct glyph):
* src/xsettings.h (struct x_display_info):
Add possibly-forward decl.
* src/syntax.h: Include buffer.h, for BVAR.
* src/sysselect.h: Include lisp.h, for eassume.
* src/termchar.h: Include <stdio.h>, for FILE.
* src/widget.h: Include <X11/IntrinsicP.h>, for Widget.
* src/xsettings.h: Include <X11/Xlib.h>, for XEvent.
Diffstat (limited to 'src/category.h')
-rw-r--r-- | src/category.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/category.h b/src/category.h index ef784c8cbf5..02f9a193ae8 100644 --- a/src/category.h +++ b/src/category.h @@ -22,6 +22,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef EMACS_CATEGORY_H +#define EMACS_CATEGORY_H /* We introduce here three types of object: category, category set, and category table. @@ -53,6 +55,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ The second extra slot is a version number of the category table. But, for the moment, we are not using this slot. */ +#include "lisp.h" + INLINE_HEADER_BEGIN #define CATEGORYP(x) RANGED_INTEGERP (0x20, x, 0x7E) @@ -116,3 +120,5 @@ CHAR_HAS_CATEGORY (int ch, int category) extern bool word_boundary_p (int, int); INLINE_HEADER_END + +#endif /* EMACS_CATEGORY_H */ |