Mercurial > emacs
changeset 109105:ff4517fe7d0b
Fix MS-DOS build due to removal of P_.
msdos.h (load_pixmap): Don't define away.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 02 Jul 2010 16:10:00 +0300 |
| parents | 1dc371b29285 (current diff) b9ea669835fc (diff) |
| children | 5e3accd3ae49 |
| files | src/ChangeLog |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jul 02 14:55:51 2010 +0200 +++ b/src/ChangeLog Fri Jul 02 16:10:00 2010 +0300 @@ -1,3 +1,10 @@ +2010-07-02 Eli Zaretskii <eliz@gnu.org> + + * dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_ + from prototypes. + + * msdos.h (load_pixmap): Don't define away. + 2010-07-02 Jan Djärv <jan.h.d@swipnet.se> * lisp.h:
--- a/src/msdos.h Fri Jul 02 14:55:51 2010 +0200 +++ b/src/msdos.h Fri Jul 02 16:10:00 2010 +0300 @@ -76,7 +76,6 @@ #define XFreeGC (void) #define x_destroy_bitmap(p1,p2) -#define load_pixmap(p1,p2,p3,p4) (0) #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9) #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines)