aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorTom Tromey2018-08-07 18:08:53 -0600
committerTom Tromey2018-08-07 18:08:53 -0600
commitd1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch)
tree04c920acf142f686d3cac11080b17a2fb0dfc9af /src/w32term.c
parent68ebff23f7057090da260830500cb278f7b886a5 (diff)
downloademacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.tar.gz
emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.zip
More macro renamings for bignum
* src/alloc.c, src/bidi.c, src/buffer.c, src/buffer.h, src/bytecode.c, src/callint.c, src/callproc.c, src/casefiddle.c, src/casetab.c, src/category.c, src/ccl.c, src/character.c, src/character.h, src/charset.c, src/charset.h, src/chartab.c, src/cmds.c, src/coding.c, src/composite.c, src/composite.h, src/data.c, src/dbusbind.c, src/decompress.c, src/dired.c, src/dispextern.h, src/dispnew.c, src/disptab.h, src/doc.c, src/dosfns.c, src/editfns.c, src/emacs-module.c, src/emacs.c, src/eval.c, src/fileio.c, src/floatfns.c, src/fns.c, src/font.c, src/font.h, src/fontset.c, src/frame.c, src/frame.h, src/fringe.c, src/ftcrfont.c, src/ftfont.c, src/gfilenotify.c, src/gnutls.c, src/gtkutil.c, src/image.c, src/indent.c, src/insdel.c, src/intervals.c, src/json.c, src/keyboard.c, src/keymap.c, src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c, src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c, src/process.c, src/profiler.c, src/search.c, src/sound.c, src/syntax.c, src/syntax.h, src/sysdep.c, src/term.c, src/termhooks.h, src/textprop.c, src/undo.c, src/w32.c, src/w32console.c, src/w32fns.c, src/w32font.c, src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c, src/w32term.h, src/w32uniscribe.c, src/window.c, src/xdisp.c, src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xml.c, src/xrdb.c, src/xselect.c, src/xsettings.c, src/xterm.c, src/xwidget.c Rename XINT->XFIXNUM, XFASTINT->XFIXNAT, XUINT->XUFIXNUM.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/w32term.c b/src/w32term.c
index cf6d516d583..9d224fe9b46 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -479,7 +479,7 @@ x_set_frame_alpha (struct frame *f)
479 if (FLOATP (Vframe_alpha_lower_limit)) 479 if (FLOATP (Vframe_alpha_lower_limit))
480 alpha_min = XFLOAT_DATA (Vframe_alpha_lower_limit); 480 alpha_min = XFLOAT_DATA (Vframe_alpha_lower_limit);
481 else if (FIXNUMP (Vframe_alpha_lower_limit)) 481 else if (FIXNUMP (Vframe_alpha_lower_limit))
482 alpha_min = (XINT (Vframe_alpha_lower_limit)) / 100.0; 482 alpha_min = (XFIXNUM (Vframe_alpha_lower_limit)) / 100.0;
483 483
484 if (alpha < 0.0) 484 if (alpha < 0.0)
485 return; 485 return;
@@ -1982,11 +1982,11 @@ x_draw_image_relief (struct glyph_string *s)
1982 && FIXNUMP (XCAR (Vtool_bar_button_margin)) 1982 && FIXNUMP (XCAR (Vtool_bar_button_margin))
1983 && FIXNUMP (XCDR (Vtool_bar_button_margin))) 1983 && FIXNUMP (XCDR (Vtool_bar_button_margin)))
1984 { 1984 {
1985 extra_x = XINT (XCAR (Vtool_bar_button_margin)); 1985 extra_x = XFIXNUM (XCAR (Vtool_bar_button_margin));
1986 extra_y = XINT (XCDR (Vtool_bar_button_margin)); 1986 extra_y = XFIXNUM (XCDR (Vtool_bar_button_margin));
1987 } 1987 }
1988 else if (FIXNUMP (Vtool_bar_button_margin)) 1988 else if (FIXNUMP (Vtool_bar_button_margin))
1989 extra_x = extra_y = XINT (Vtool_bar_button_margin); 1989 extra_x = extra_y = XFIXNUM (Vtool_bar_button_margin);
1990 } 1990 }
1991 1991
1992 top_p = bot_p = left_p = right_p = 0; 1992 top_p = bot_p = left_p = right_p = 0;
@@ -2482,7 +2482,7 @@ x_draw_glyph_string (struct glyph_string *s)
2482 = buffer_local_value (Qunderline_minimum_offset, 2482 = buffer_local_value (Qunderline_minimum_offset,
2483 s->w->contents); 2483 s->w->contents);
2484 if (FIXNUMP (val)) 2484 if (FIXNUMP (val))
2485 minimum_offset = XFASTINT (val); 2485 minimum_offset = XFIXNAT (val);
2486 else 2486 else
2487 minimum_offset = 1; 2487 minimum_offset = 1;
2488 val = buffer_local_value (Qx_underline_at_descent_line, 2488 val = buffer_local_value (Qx_underline_at_descent_line,
@@ -3573,8 +3573,8 @@ w32_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
3573static void 3573static void
3574w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) 3574w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event)
3575{ 3575{
3576 int x = XFASTINT (button_event->x); 3576 int x = XFIXNAT (button_event->x);
3577 int y = XFASTINT (button_event->y); 3577 int y = XFIXNAT (button_event->y);
3578 3578
3579 if (button_event->modifiers & down_modifier) 3579 if (button_event->modifiers & down_modifier)
3580 handle_tool_bar_click (f, x, y, 1, 0); 3580 handle_tool_bar_click (f, x, y, 1, 0);
@@ -4996,8 +4996,8 @@ w32_read_socket (struct terminal *terminal,
4996 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window))) 4996 && WINDOW_TOTAL_LINES (XWINDOW (f->tool_bar_window)))
4997 { 4997 {
4998 Lisp_Object window; 4998 Lisp_Object window;
4999 int x = XFASTINT (inev.x); 4999 int x = XFIXNAT (inev.x);
5000 int y = XFASTINT (inev.y); 5000 int y = XFIXNAT (inev.y);
5001 5001
5002 window = window_from_coordinates (f, x, y, 0, 1); 5002 window = window_from_coordinates (f, x, y, 0, 1);
5003 5003
@@ -6145,8 +6145,8 @@ x_calc_absolute_position (struct frame *f)
6145 monitor_left = Fnth (make_fixnum (1), geometry); 6145 monitor_left = Fnth (make_fixnum (1), geometry);
6146 monitor_top = Fnth (make_fixnum (2), geometry); 6146 monitor_top = Fnth (make_fixnum (2), geometry);
6147 6147
6148 display_left = min (display_left, XINT (monitor_left)); 6148 display_left = min (display_left, XFIXNUM (monitor_left));
6149 display_top = min (display_top, XINT (monitor_top)); 6149 display_top = min (display_top, XFIXNUM (monitor_top));
6150 } 6150 }
6151 } 6151 }
6152 } 6152 }