[Emacs-diffs] /srv/bzr/emacs/trunk r100689: Fix MS-DOS build due to removal of P_.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100689 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-02 16:10:00 +0300
message:
  Fix MS-DOS build due to removal of P_.
  
   msdos.h (load_pixmap): Don't define away.
modified:
  src/ChangeLog
  src/msdos.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-02 12:55:51 +0000
+++ b/src/ChangeLog     2010-07-02 13:10:00 +0000
@@ -1,3 +1,10 @@
+2010-07-02  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lisp.h:

=== modified file 'src/msdos.h'
--- a/src/msdos.h       2010-07-02 09:26:33 +0000
+++ b/src/msdos.h       2010-07-02 13:05:59 +0000
@@ -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)