diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-02 09:21:19 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-02 09:22:17 -0800 |
commit | d0d26c1379598983d2163deb13ba8ab13b14ba2c (patch) | |
tree | 93e7cef298261c30eac66ec00b4250076d015419 /src/frame.h | |
parent | 4e2622bf0d63c40f447d44e6401ea054ef55b261 (diff) | |
download | emacs-d0d26c1379598983d2163deb13ba8ab13b14ba2c.tar.gz |
Remove XFLOATINT
* src/lisp.h (XFLOATINT): Remove this alias for extract_float.
All callers changed to use extract_float.
* src/frame.h (NUMVAL): Now an inline function, not a macro.
Diffstat (limited to 'src/frame.h')
-rw-r--r-- | src/frame.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/frame.h b/src/frame.h index 7331352a201..6f85f85e795 100644 --- a/src/frame.h +++ b/src/frame.h @@ -621,7 +621,11 @@ fset_desired_tool_bar_string (struct frame *f, Lisp_Object val) } #endif /* HAVE_WINDOW_SYSTEM && !USE_GTK && !HAVE_NS */ -#define NUMVAL(X) (NUMBERP (X) ? XFLOATINT (X) : -1) +INLINE double +NUMVAL (Lisp_Object x) +{ + return NUMBERP (x) ? extract_float (x) : -1; +} INLINE double default_pixels_per_inch_x (void) |