aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorPaul Eggert2012-08-02 00:31:34 -0700
committerPaul Eggert2012-08-02 00:31:34 -0700
commitf162bcc31c3d7d168da47ca2f007f58e11a36948 (patch)
treeeef19d0a840bd99304751fef539ba100134c91b9 /src/dispextern.h
parent8922df07b2f370debf70424f778073e1ca32e5e3 (diff)
downloademacs-f162bcc31c3d7d168da47ca2f007f58e11a36948.tar.gz
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/dispextern.h')
-rw-r--r--src/dispextern.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index add228e0088..47a3f971f25 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -46,8 +46,13 @@ typedef struct {
46#include "msdos.h" 46#include "msdos.h"
47#endif 47#endif
48 48
49INLINE_HEADER_BEGIN
50#ifndef DISPEXTERN_INLINE
51# define DISPEXTERN_INLINE INLINE
52#endif
53
49#include <c-strcase.h> 54#include <c-strcase.h>
50static inline int 55DISPEXTERN_INLINE int
51xstrcasecmp (char const *a, char const *b) 56xstrcasecmp (char const *a, char const *b)
52{ 57{
53 return c_strcasecmp (a, b); 58 return c_strcasecmp (a, b);
@@ -3400,4 +3405,6 @@ extern Lisp_Object x_default_parameter (struct frame *, Lisp_Object,
3400 3405
3401#endif /* HAVE_WINDOW_SYSTEM */ 3406#endif /* HAVE_WINDOW_SYSTEM */
3402 3407
3408INLINE_HEADER_END
3409
3403#endif /* not DISPEXTERN_H_INCLUDED */ 3410#endif /* not DISPEXTERN_H_INCLUDED */