diff options
| author | Paul Eggert | 2011-05-11 14:42:11 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-11 14:42:11 -0700 |
| commit | bc827e23be4630f4b5d7a1895e37cfab89eb6b6a (patch) | |
| tree | 4e3b8b00dc7d102fa16558588a118a0813909fea /src | |
| parent | 78eb494ecaa1a20112080faedfd30e616c5be76b (diff) | |
| download | emacs-bc827e23be4630f4b5d7a1895e37cfab89eb6b6a.tar.gz emacs-bc827e23be4630f4b5d7a1895e37cfab89eb6b6a.zip | |
* lisp.h (XINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_INT.
(XUINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_UINT.
Otherwise, GCC 4.6.0 warns about printf (pI, XINT (...)),
presumably because the widths might not match.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lisp.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8dc51c0d01b..550dd28eb24 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2011-05-11 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-05-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lisp.h (XINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_INT. | ||
| 4 | (XUINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_UINT. | ||
| 5 | Otherwise, GCC 4.6.0 warns about printf (pI, XINT (...)), | ||
| 6 | presumably because the widths might not match. | ||
| 7 | |||
| 3 | * window.c (size_window): Avoid needless test at loop start. | 8 | * window.c (size_window): Avoid needless test at loop start. |
| 4 | 9 | ||
| 5 | 2011-05-10 Juanma Barranquero <lekktu@gmail.com> | 10 | 2011-05-10 Juanma Barranquero <lekktu@gmail.com> |
diff --git a/src/lisp.h b/src/lisp.h index 66f5c962be8..2342ea2bdbe 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -470,8 +470,8 @@ enum pvec_type | |||
| 470 | 470 | ||
| 471 | #define XHASH(a) ((a).i) | 471 | #define XHASH(a) ((a).i) |
| 472 | #define XTYPE(a) ((enum Lisp_Type) (a).u.type) | 472 | #define XTYPE(a) ((enum Lisp_Type) (a).u.type) |
| 473 | #define XINT(a) ((a).s.val) | 473 | #define XINT(a) ((EMACS_INT) (a).s.val) |
| 474 | #define XUINT(a) ((a).u.val) | 474 | #define XUINT(a) ((EMACS_UINT) (a).u.val) |
| 475 | 475 | ||
| 476 | #ifdef USE_LSB_TAG | 476 | #ifdef USE_LSB_TAG |
| 477 | 477 | ||