diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-29 10:56:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-29 10:56:27 -0700 |
| commit | d01a78266d12561b46777a2156914d12d8099c4f (patch) | |
| tree | 3fa5ec64d44faeca79a6fe89b88362cda723fdff /src/xdisp.c | |
| parent | 7fd47d5ce2020a22f8db9776e8d1f47891b966dc (diff) | |
| download | emacs-d01a78266d12561b46777a2156914d12d8099c4f.tar.gz | |
* lisp.h (EMACS_INTPTR): Remove. All uses changed to intptr_t.
(EMACS_UINTPTR): Likewise, with uintptr_t.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index af03a504e86..88353e37925 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8737,7 +8737,7 @@ display_echo_area (struct window *w) window_height_changed_p = with_echo_area_buffer (w, display_last_displayed_message_p, display_echo_area_1, - (EMACS_INTPTR) w, Qnil, 0, 0); + (intptr_t) w, Qnil, 0, 0); if (no_message_p) echo_area_buffer[i] = Qnil; @@ -8756,7 +8756,7 @@ display_echo_area (struct window *w) static int display_echo_area_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT a3, EMACS_INT a4) { - EMACS_INTPTR i1 = a1; + intptr_t i1 = a1; struct window *w = (struct window *) i1; Lisp_Object window; struct text_pos start; @@ -8799,7 +8799,7 @@ resize_echo_area_exactly (void) resize_exactly = Qnil; resized_p = with_echo_area_buffer (w, 0, resize_mini_window_1, - (EMACS_INTPTR) w, resize_exactly, + (intptr_t) w, resize_exactly, 0, 0); if (resized_p) { @@ -8820,7 +8820,7 @@ resize_echo_area_exactly (void) static int resize_mini_window_1 (EMACS_INT a1, Lisp_Object exactly, EMACS_INT a3, EMACS_INT a4) { - EMACS_INTPTR i1 = a1; + intptr_t i1 = a1; return resize_mini_window ((struct window *) i1, !NILP (exactly)); } @@ -8987,7 +8987,7 @@ current_message (void) else { with_echo_area_buffer (0, 0, current_message_1, - (EMACS_INTPTR) &msg, Qnil, 0, 0); + (intptr_t) &msg, Qnil, 0, 0); if (NILP (msg)) echo_area_buffer[0] = Qnil; } @@ -8999,7 +8999,7 @@ current_message (void) static int current_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT a3, EMACS_INT a4) { - EMACS_INTPTR i1 = a1; + intptr_t i1 = a1; Lisp_Object *msg = (Lisp_Object *) i1; if (Z > BEG) @@ -9131,7 +9131,7 @@ set_message (const char *s, Lisp_Object string, || (STRINGP (string) && STRING_MULTIBYTE (string))); with_echo_area_buffer (0, -1, set_message_1, - (EMACS_INTPTR) s, string, nbytes, multibyte_p); + (intptr_t) s, string, nbytes, multibyte_p); message_buf_print = 0; help_echo_showing_p = 0; } @@ -9145,7 +9145,7 @@ set_message (const char *s, Lisp_Object string, static int set_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT nbytes, EMACS_INT multibyte_p) { - EMACS_INTPTR i1 = a1; + intptr_t i1 = a1; const char *s = (const char *) i1; const unsigned char *msg = (const unsigned char *) s; Lisp_Object string = a2; |