diff options
| author | Paul Eggert | 2013-09-20 08:34:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-09-20 08:34:36 -0700 |
| commit | 00382e8b9834e58203507d0461884671b78ebc01 (patch) | |
| tree | cf28670199af0c1189cbcfbd14ffa49cbaaa0fba /lib-src | |
| parent | 2fd3a9f7491a59d427150fab0ad4df6ea12b3249 (diff) | |
| download | emacs-00382e8b9834e58203507d0461884671b78ebc01.tar.gz emacs-00382e8b9834e58203507d0461884671b78ebc01.zip | |
A simpler, centralized INLINE.
* lib-src/profile.c (INLINE): New macro.
(SYSTIME_INLINE): Remove.
* src/conf_post.h (INLINE): Define only if not already defined.
This allows us to use a single INLINE, defined by one file
per executable.
* src/emacs.c (INLINE): Define it.
Also, include category.h, charset.h, composite.h, dispextern.h,
syntax.h, systime.h, so that their INLINE definitions are expanded
properly for Emacs.
* src/blockinput.h, src/keyboard.c (BLOCKINPUT_INLINE):
* src/buffer.h, src/buffer.c (BUFFER_INLINE):
* src/category.h, src/category.c (CATEGORY_INLINE):
* src/character.h, src/character.c (CHARACTER_INLINE):
* src/charset.h, src/charset.c (CHARSET_INLINE):
* src/composite.h, src/composite.c (COMPOSITE_INLINE):
* src/dispextern.h, src/dispnew.c (DISPEXTERN_INLINE):
* src/frame.h, src/frame.c (FRAME_INLINE):
* src/intervals.h, src/intervals.c (INTERVALS_INLINE):
* src/keyboard.h, src/keyboard.c (KEYBOARD_INLINE):
* src/lisp.h, src/alloc.c (LISP_INLINE):
* src/process.h, src/process.c (PROCESS_INLINE):
* src/syntax.h, src/syntax.c (SYNTAX_INLINE):
* src/systime.h, src/sysdep.c (SYSTIME_INLINE):
* src/termhooks.h, src/terminal.h (TERMHOOKS_INLINE):
* src/window.h, src/window.c (WINDOW_INLINE):
Remove. All uses replaced with INLINE.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/profile.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d2e9dd18177..1186a0c025c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-09-20 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | A simpler, centralized INLINE. | ||
| 4 | * profile.c (INLINE): New macro. | ||
| 5 | (SYSTIME_INLINE): Remove. | ||
| 6 | |||
| 1 | 2013-08-28 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2013-08-28 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, | 9 | * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, |
diff --git a/lib-src/profile.c b/lib-src/profile.c index bddfea76334..aab44a0fe86 100644 --- a/lib-src/profile.c +++ b/lib-src/profile.c | |||
| @@ -29,9 +29,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 29 | ** abstraction : a stopwatch | 29 | ** abstraction : a stopwatch |
| 30 | ** operations: reset_watch, get_time | 30 | ** operations: reset_watch, get_time |
| 31 | */ | 31 | */ |
| 32 | #include <config.h> | ||
| 33 | 32 | ||
| 34 | #define SYSTIME_INLINE EXTERN_INLINE | 33 | #define INLINE EXTERN_INLINE |
| 34 | #include <config.h> | ||
| 35 | 35 | ||
| 36 | #include <inttypes.h> | 36 | #include <inttypes.h> |
| 37 | #include <stdio.h> | 37 | #include <stdio.h> |