aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Kuleshov2017-07-08 11:15:52 +0300
committerEli Zaretskii2017-07-08 11:15:52 +0300
commit92307cb05d8b0d05dab7981f30c13962f8050eb0 (patch)
tree7f4a2c3803568b86ec488d07011867d0c25ccd40 /src
parent6e2a2b334d6ab58722ddd0eda19413c115573980 (diff)
downloademacs-92307cb05d8b0d05dab7981f30c13962f8050eb0.tar.gz
emacs-92307cb05d8b0d05dab7981f30c13962f8050eb0.zip
Avoid compiler warnings in xdisp.c debugging code
* src/xdisp.c (dump_glyph, dump_glyph_row, Fdump_glyph_matrix): Use pD directives for ptrdiff_t values instead of pI, to avoid compilation warnings on 64-bit hosts. (Bug#27597)
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index fad23bfdc9d..5df2dd18311 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19149,7 +19149,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
19149 || glyph->type == GLYPHLESS_GLYPH) 19149 || glyph->type == GLYPHLESS_GLYPH)
19150 { 19150 {
19151 fprintf (stderr, 19151 fprintf (stderr,
19152 " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n", 19152 " %5"pD"d %c %9"pD"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n",
19153 glyph - row->glyphs[TEXT_AREA], 19153 glyph - row->glyphs[TEXT_AREA],
19154 (glyph->type == CHAR_GLYPH 19154 (glyph->type == CHAR_GLYPH
19155 ? 'C' 19155 ? 'C'
@@ -19174,7 +19174,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
19174 else if (glyph->type == STRETCH_GLYPH) 19174 else if (glyph->type == STRETCH_GLYPH)
19175 { 19175 {
19176 fprintf (stderr, 19176 fprintf (stderr,
19177 " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n", 19177 " %5"pD"d %c %9"pD"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n",
19178 glyph - row->glyphs[TEXT_AREA], 19178 glyph - row->glyphs[TEXT_AREA],
19179 'S', 19179 'S',
19180 glyph->charpos, 19180 glyph->charpos,
@@ -19195,7 +19195,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
19195 else if (glyph->type == IMAGE_GLYPH) 19195 else if (glyph->type == IMAGE_GLYPH)
19196 { 19196 {
19197 fprintf (stderr, 19197 fprintf (stderr,
19198 " %5"pD"d %c %9"pI"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n", 19198 " %5"pD"d %c %9"pD"d %c %3d 0x%06x %c %4d %1.1d%1.1d\n",
19199 glyph - row->glyphs[TEXT_AREA], 19199 glyph - row->glyphs[TEXT_AREA],
19200 'I', 19200 'I',
19201 glyph->charpos, 19201 glyph->charpos,
@@ -19216,7 +19216,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
19216 else if (glyph->type == COMPOSITE_GLYPH) 19216 else if (glyph->type == COMPOSITE_GLYPH)
19217 { 19217 {
19218 fprintf (stderr, 19218 fprintf (stderr,
19219 " %5"pD"d %c %9"pI"d %c %3d 0x%06x", 19219 " %5"pD"d %c %9"pD"d %c %3d 0x%06x",
19220 glyph - row->glyphs[TEXT_AREA], 19220 glyph - row->glyphs[TEXT_AREA],
19221 '+', 19221 '+',
19222 glyph->charpos, 19222 glyph->charpos,
@@ -19277,7 +19277,7 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
19277 fprintf (stderr, "Row Start End Used oE><\\CTZFesm X Y W H V A P\n"); 19277 fprintf (stderr, "Row Start End Used oE><\\CTZFesm X Y W H V A P\n");
19278 fprintf (stderr, "==============================================================================\n"); 19278 fprintf (stderr, "==============================================================================\n");
19279 19279
19280 fprintf (stderr, "%3d %9"pI"d %9"pI"d %4d %1.1d%1.1d%1.1d%1.1d\ 19280 fprintf (stderr, "%3d %9"pD"d %9"pD"d %4d %1.1d%1.1d%1.1d%1.1d\
19281%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", 19281%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n",
19282 vpos, 19282 vpos,
19283 MATRIX_ROW_START_CHARPOS (row), 19283 MATRIX_ROW_START_CHARPOS (row),
@@ -19306,7 +19306,7 @@ dump_glyph_row (struct glyph_row *row, int vpos, int glyphs)
19306 fprintf (stderr, " %9"pD"d %9"pD"d\t%5d\n", row->start.overlay_string_index, 19306 fprintf (stderr, " %9"pD"d %9"pD"d\t%5d\n", row->start.overlay_string_index,
19307 row->end.overlay_string_index, 19307 row->end.overlay_string_index,
19308 row->continuation_lines_width); 19308 row->continuation_lines_width);
19309 fprintf (stderr, " %9"pI"d %9"pI"d\n", 19309 fprintf (stderr, " %9"pD"d %9"pD"d\n",
19310 CHARPOS (row->start.string_pos), 19310 CHARPOS (row->start.string_pos),
19311 CHARPOS (row->end.string_pos)); 19311 CHARPOS (row->end.string_pos));
19312 fprintf (stderr, " %9d %9d\n", row->start.dpvec_index, 19312 fprintf (stderr, " %9d %9d\n", row->start.dpvec_index,
@@ -19383,7 +19383,7 @@ with numeric argument, its value is passed as the GLYPHS flag. */)
19383 struct window *w = XWINDOW (selected_window); 19383 struct window *w = XWINDOW (selected_window);
19384 struct buffer *buffer = XBUFFER (w->contents); 19384 struct buffer *buffer = XBUFFER (w->contents);
19385 19385
19386 fprintf (stderr, "PT = %"pI"d, BEGV = %"pI"d. ZV = %"pI"d\n", 19386 fprintf (stderr, "PT = %"pD"d, BEGV = %"pD"d. ZV = %"pD"d\n",
19387 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer)); 19387 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer));
19388 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n", 19388 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n",
19389 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos); 19389 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos);