2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cac04c6909d..ae024da468d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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:
diff --git a/src/msdos.h b/src/msdos.h
index 3ace5123227..5f8b5e72532 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -76,7 +76,6 @@ extern int x_pixel_height (struct frame *);
 
 #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)