# HG changeset patch # User Eli Zaretskii # Date 1278076200 -10800 # Node ID ff4517fe7d0b6e0bb733ae83f39836df789954e5 # Parent 1dc371b29285302cb173d20296245b040a61be35# Parent b9ea669835fcafc9d56b1ad02098a776a49b2d73 Fix MS-DOS build due to removal of P_. msdos.h (load_pixmap): Don't define away. diff -r 1dc371b29285 -r ff4517fe7d0b src/ChangeLog --- 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 + + * 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 * lisp.h: diff -r 1dc371b29285 -r ff4517fe7d0b src/msdos.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)