aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32proc.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/w32proc.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/w32proc.c')
-rw-r--r--src/w32proc.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/w32proc.c b/src/w32proc.c
index 4cffdd0d9d7..61ce157b558 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1890,7 +1890,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
1890 /* Override escape char by binding w32-quote-process-args to 1890 /* Override escape char by binding w32-quote-process-args to
1891 desired character, or use t for auto-selection. */ 1891 desired character, or use t for auto-selection. */
1892 if (FIXNUMP (Vw32_quote_process_args)) 1892 if (FIXNUMP (Vw32_quote_process_args))
1893 escape_char = XINT (Vw32_quote_process_args); 1893 escape_char = XFIXNUM (Vw32_quote_process_args);
1894 else 1894 else
1895 escape_char = (is_cygnus_app || is_msys_app) ? '"' : '\\'; 1895 escape_char = (is_cygnus_app || is_msys_app) ? '"' : '\\';
1896 } 1896 }
@@ -3023,7 +3023,7 @@ If successful, the return value is t, otherwise nil. */)
3023 externally. This is necessary because real pids on Windows 95 are 3023 externally. This is necessary because real pids on Windows 95 are
3024 negative. */ 3024 negative. */
3025 3025
3026 pid = XINT (process); 3026 pid = XFIXNUM (process);
3027 cp = find_child_pid (pid); 3027 cp = find_child_pid (pid);
3028 if (cp != NULL) 3028 if (cp != NULL)
3029 pid = cp->procinfo.dwProcessId; 3029 pid = cp->procinfo.dwProcessId;
@@ -3188,12 +3188,12 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */)
3188 3188
3189 CHECK_FIXNUM (lcid); 3189 CHECK_FIXNUM (lcid);
3190 3190
3191 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) 3191 if (!IsValidLocale (XFIXNUM (lcid), LCID_SUPPORTED))
3192 return Qnil; 3192 return Qnil;
3193 3193
3194 if (NILP (longform)) 3194 if (NILP (longform))
3195 { 3195 {
3196 got_abbrev = GetLocaleInfo (XINT (lcid), 3196 got_abbrev = GetLocaleInfo (XFIXNUM (lcid),
3197 LOCALE_SABBREVLANGNAME | LOCALE_USE_CP_ACP, 3197 LOCALE_SABBREVLANGNAME | LOCALE_USE_CP_ACP,
3198 abbrev_name, sizeof (abbrev_name)); 3198 abbrev_name, sizeof (abbrev_name));
3199 if (got_abbrev) 3199 if (got_abbrev)
@@ -3201,7 +3201,7 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */)
3201 } 3201 }
3202 else if (EQ (longform, Qt)) 3202 else if (EQ (longform, Qt))
3203 { 3203 {
3204 got_full = GetLocaleInfo (XINT (lcid), 3204 got_full = GetLocaleInfo (XFIXNUM (lcid),
3205 LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP, 3205 LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP,
3206 full_name, sizeof (full_name)); 3206 full_name, sizeof (full_name));
3207 if (got_full) 3207 if (got_full)
@@ -3209,8 +3209,8 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */)
3209 } 3209 }
3210 else if (FIXED_OR_FLOATP (longform)) 3210 else if (FIXED_OR_FLOATP (longform))
3211 { 3211 {
3212 got_full = GetLocaleInfo (XINT (lcid), 3212 got_full = GetLocaleInfo (XFIXNUM (lcid),
3213 XINT (longform), 3213 XFIXNUM (longform),
3214 full_name, sizeof (full_name)); 3214 full_name, sizeof (full_name));
3215 /* GetLocaleInfo's return value includes the terminating null 3215 /* GetLocaleInfo's return value includes the terminating null
3216 character, when the returned information is a string, whereas 3216 character, when the returned information is a string, whereas
@@ -3301,16 +3301,16 @@ If successful, the new locale id is returned, otherwise nil. */)
3301{ 3301{
3302 CHECK_FIXNUM (lcid); 3302 CHECK_FIXNUM (lcid);
3303 3303
3304 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) 3304 if (!IsValidLocale (XFIXNUM (lcid), LCID_SUPPORTED))
3305 return Qnil; 3305 return Qnil;
3306 3306
3307 if (!SetThreadLocale (XINT (lcid))) 3307 if (!SetThreadLocale (XFIXNUM (lcid)))
3308 return Qnil; 3308 return Qnil;
3309 3309
3310 /* Need to set input thread locale if present. */ 3310 /* Need to set input thread locale if present. */
3311 if (dwWindowsThreadId) 3311 if (dwWindowsThreadId)
3312 /* Reply is not needed. */ 3312 /* Reply is not needed. */
3313 PostThreadMessage (dwWindowsThreadId, WM_EMACS_SETLOCALE, XINT (lcid), 0); 3313 PostThreadMessage (dwWindowsThreadId, WM_EMACS_SETLOCALE, XFIXNUM (lcid), 0);
3314 3314
3315 return make_fixnum (GetThreadLocale ()); 3315 return make_fixnum (GetThreadLocale ());
3316} 3316}
@@ -3360,10 +3360,10 @@ If successful, the new CP is returned, otherwise nil. */)
3360{ 3360{
3361 CHECK_FIXNUM (cp); 3361 CHECK_FIXNUM (cp);
3362 3362
3363 if (!IsValidCodePage (XINT (cp))) 3363 if (!IsValidCodePage (XFIXNUM (cp)))
3364 return Qnil; 3364 return Qnil;
3365 3365
3366 if (!SetConsoleCP (XINT (cp))) 3366 if (!SetConsoleCP (XFIXNUM (cp)))
3367 return Qnil; 3367 return Qnil;
3368 3368
3369 return make_fixnum (GetConsoleCP ()); 3369 return make_fixnum (GetConsoleCP ());
@@ -3388,10 +3388,10 @@ If successful, the new CP is returned, otherwise nil. */)
3388{ 3388{
3389 CHECK_FIXNUM (cp); 3389 CHECK_FIXNUM (cp);
3390 3390
3391 if (!IsValidCodePage (XINT (cp))) 3391 if (!IsValidCodePage (XFIXNUM (cp)))
3392 return Qnil; 3392 return Qnil;
3393 3393
3394 if (!SetConsoleOutputCP (XINT (cp))) 3394 if (!SetConsoleOutputCP (XFIXNUM (cp)))
3395 return Qnil; 3395 return Qnil;
3396 3396
3397 return make_fixnum (GetConsoleOutputCP ()); 3397 return make_fixnum (GetConsoleOutputCP ());
@@ -3414,13 +3414,13 @@ yield nil. */)
3414 3414
3415 CHECK_FIXNUM (cp); 3415 CHECK_FIXNUM (cp);
3416 3416
3417 if (!IsValidCodePage (XINT (cp))) 3417 if (!IsValidCodePage (XFIXNUM (cp)))
3418 return Qnil; 3418 return Qnil;
3419 3419
3420 /* Going through a temporary DWORD_PTR variable avoids compiler warning 3420 /* Going through a temporary DWORD_PTR variable avoids compiler warning
3421 about cast to pointer from integer of different size, when 3421 about cast to pointer from integer of different size, when
3422 building --with-wide-int or building for 64bit. */ 3422 building --with-wide-int or building for 64bit. */
3423 dwcp = XINT (cp); 3423 dwcp = XFIXNUM (cp);
3424 if (TranslateCharsetInfo ((DWORD *) dwcp, &info, TCI_SRCCODEPAGE)) 3424 if (TranslateCharsetInfo ((DWORD *) dwcp, &info, TCI_SRCCODEPAGE))
3425 return make_fixnum (info.ciCharset); 3425 return make_fixnum (info.ciCharset);
3426 3426
@@ -3480,8 +3480,8 @@ If successful, the new layout id is returned, otherwise nil. */)
3480 CHECK_FIXNUM_CAR (layout); 3480 CHECK_FIXNUM_CAR (layout);
3481 CHECK_FIXNUM_CDR (layout); 3481 CHECK_FIXNUM_CDR (layout);
3482 3482
3483 kl = (HKL) (UINT_PTR) ((XINT (XCAR (layout)) & 0xffff) 3483 kl = (HKL) (UINT_PTR) ((XFIXNUM (XCAR (layout)) & 0xffff)
3484 | (XINT (XCDR (layout)) << 16)); 3484 | (XFIXNUM (XCDR (layout)) << 16));
3485 3485
3486 /* Synchronize layout with input thread. */ 3486 /* Synchronize layout with input thread. */
3487 if (dwWindowsThreadId) 3487 if (dwWindowsThreadId)