diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-02 00:31:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-02 00:31:34 -0700 |
| commit | f162bcc31c3d7d168da47ca2f007f58e11a36948 (patch) | |
| tree | eef19d0a840bd99304751fef539ba100134c91b9 /src/category.h | |
| parent | 8922df07b2f370debf70424f778073e1ca32e5e3 (diff) | |
| download | emacs-f162bcc31c3d7d168da47ca2f007f58e11a36948.tar.gz emacs-f162bcc31c3d7d168da47ca2f007f58e11a36948.tar.bz2 emacs-f162bcc31c3d7d168da47ca2f007f58e11a36948.zip | |
Use C99-style 'extern inline' if available.
* lib-src/profile.c (SYSTIME_INLINE): Define.
* nt/config.nt: Sync with autogen/config.in.
(_GL_INLINE, _GL_EXTERN_INLINE, _GL_INLINE_HEADER_BEGIN)
(_GL_INLINE_HEADER_END): New macros.
* src/buffer.h (BUFFER_INLINE):
* src/category.h (CATEGORY_INLINE):
* src/character.h (CHARACTER_INLINE):
* src/charset.h (CHARSET_INLINE):
* src/composite.h (COMPOSITE_INLINE):
* src/dispextern.h (DISPEXTERN_INLINE):
* src/lisp.h (LISP_INLINE):
* src/systime.h (SYSTIME_INLINE):
New macro, replacing 'static inline' in this header.
* src/buffer.h, src/category.h, src/character.h, src/charset.h:
* src/composite.h, src/dispextern.h, lisp.h, systime.h:
Use INLINE_HEADER_BEGIN, INLINE_HEADER_END.
* src/alloc.c (LISP_INLINE):
* src/buffer.c (BUFFER_INLINE):
* src/category.c (CATEGORY_INLINE):
* src/character.c (CHARACTER_INLINE):
* src/charset.c (CHARSET_INLINE):
* src/composite.c (COMPOSITE_INLINE):
* src/dispnew.c (DISPEXTERN_INLINE):
* src/sysdep.c (SYSTIME_INLINE):
Define to EXTERN_INLINE, so that the corresponding functions
are compiled into code.
* src/conf_post.h (INLINE, EXTERN_INLINE, INLINE_HEADER_BEGIN)
(INLINE_HEADER_END): New macros.
* src/lisp.h (PSEUDOVECTOR_FLAG): Now a macro as well as a constant,
since it's used in non-static inline functions now.
Diffstat (limited to 'src/category.h')
| -rw-r--r-- | src/category.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/category.h b/src/category.h index 580e516afd9..f29034acff1 100644 --- a/src/category.h +++ b/src/category.h @@ -53,6 +53,11 @@ 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. */ +INLINE_HEADER_BEGIN +#ifndef CATEGORY_INLINE +# define CATEGORY_INLINE INLINE +#endif + #define CATEGORYP(x) RANGED_INTEGERP (0x20, x, 0x7E) #define CHECK_CATEGORY(x) \ @@ -79,7 +84,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ >> ((category) % 8)) & 1) /* Return 1 if category set of CH contains CATEGORY, else return 0. */ -static inline int +CATEGORY_INLINE int CHAR_HAS_CATEGORY (int ch, int category) { Lisp_Object category_set = CATEGORY_SET (ch); @@ -108,3 +113,5 @@ CHAR_HAS_CATEGORY (int ch, int category) && word_boundary_p (c1, c2)) extern int word_boundary_p (int, int); + +INLINE_HEADER_END |