diff options
| author | Tom Tromey | 2018-08-07 18:08:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-07 18:08:53 -0600 |
| commit | d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch) | |
| tree | 04c920acf142f686d3cac11080b17a2fb0dfc9af /src/dbusbind.c | |
| parent | 68ebff23f7057090da260830500cb278f7b886a5 (diff) | |
| download | emacs-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/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index ac3e0626000..4cf5604d745 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -522,8 +522,8 @@ xd_extract_signed (Lisp_Object x, intmax_t lo, intmax_t hi) | |||
| 522 | CHECK_FIXNUM_OR_FLOAT (x); | 522 | CHECK_FIXNUM_OR_FLOAT (x); |
| 523 | if (FIXNUMP (x)) | 523 | if (FIXNUMP (x)) |
| 524 | { | 524 | { |
| 525 | if (lo <= XINT (x) && XINT (x) <= hi) | 525 | if (lo <= XFIXNUM (x) && XFIXNUM (x) <= hi) |
| 526 | return XINT (x); | 526 | return XFIXNUM (x); |
| 527 | } | 527 | } |
| 528 | else | 528 | else |
| 529 | { | 529 | { |
| @@ -550,8 +550,8 @@ xd_extract_unsigned (Lisp_Object x, uintmax_t hi) | |||
| 550 | CHECK_FIXNUM_OR_FLOAT (x); | 550 | CHECK_FIXNUM_OR_FLOAT (x); |
| 551 | if (FIXNUMP (x)) | 551 | if (FIXNUMP (x)) |
| 552 | { | 552 | { |
| 553 | if (0 <= XINT (x) && XINT (x) <= hi) | 553 | if (0 <= XFIXNUM (x) && XFIXNUM (x) <= hi) |
| 554 | return XINT (x); | 554 | return XFIXNUM (x); |
| 555 | } | 555 | } |
| 556 | else | 556 | else |
| 557 | { | 557 | { |
| @@ -586,7 +586,7 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter) | |||
| 586 | case DBUS_TYPE_BYTE: | 586 | case DBUS_TYPE_BYTE: |
| 587 | CHECK_FIXNAT (object); | 587 | CHECK_FIXNAT (object); |
| 588 | { | 588 | { |
| 589 | unsigned char val = XFASTINT (object) & 0xFF; | 589 | unsigned char val = XFIXNAT (object) & 0xFF; |
| 590 | XD_DEBUG_MESSAGE ("%c %u", dtype, val); | 590 | XD_DEBUG_MESSAGE ("%c %u", dtype, val); |
| 591 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) | 591 | if (!dbus_message_iter_append_basic (iter, dtype, &val)) |
| 592 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); | 592 | XD_SIGNAL2 (build_string ("Unable to append argument"), object); |
| @@ -1276,10 +1276,10 @@ usage: (dbus-message-internal &rest REST) */) | |||
| 1276 | handler = Qnil; | 1276 | handler = Qnil; |
| 1277 | 1277 | ||
| 1278 | CHECK_FIXNAT (message_type); | 1278 | CHECK_FIXNAT (message_type); |
| 1279 | if (! (DBUS_MESSAGE_TYPE_INVALID < XFASTINT (message_type) | 1279 | if (! (DBUS_MESSAGE_TYPE_INVALID < XFIXNAT (message_type) |
| 1280 | && XFASTINT (message_type) < DBUS_NUM_MESSAGE_TYPES)) | 1280 | && XFIXNAT (message_type) < DBUS_NUM_MESSAGE_TYPES)) |
| 1281 | XD_SIGNAL2 (build_string ("Invalid message type"), message_type); | 1281 | XD_SIGNAL2 (build_string ("Invalid message type"), message_type); |
| 1282 | mtype = XFASTINT (message_type); | 1282 | mtype = XFIXNAT (message_type); |
| 1283 | 1283 | ||
| 1284 | if ((mtype == DBUS_MESSAGE_TYPE_METHOD_CALL) | 1284 | if ((mtype == DBUS_MESSAGE_TYPE_METHOD_CALL) |
| 1285 | || (mtype == DBUS_MESSAGE_TYPE_SIGNAL)) | 1285 | || (mtype == DBUS_MESSAGE_TYPE_SIGNAL)) |
| @@ -1410,7 +1410,7 @@ usage: (dbus-message-internal &rest REST) */) | |||
| 1410 | if ((count + 2 <= nargs) && EQ (args[count], QCtimeout)) | 1410 | if ((count + 2 <= nargs) && EQ (args[count], QCtimeout)) |
| 1411 | { | 1411 | { |
| 1412 | CHECK_FIXNAT (args[count+1]); | 1412 | CHECK_FIXNAT (args[count+1]); |
| 1413 | timeout = min (XFASTINT (args[count+1]), INT_MAX); | 1413 | timeout = min (XFIXNAT (args[count+1]), INT_MAX); |
| 1414 | count = count+2; | 1414 | count = count+2; |
| 1415 | } | 1415 | } |
| 1416 | 1416 | ||