# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1278075959 -10800
# Node ID b9ea669835fcafc9d56b1ad02098a776a49b2d73
# Parent  388f412256c03486a42cd11a90e44a6c3a7886d6
Fix the MS-DOS build due to removal of P_.

 dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_
 from prototypes.
 msdos.h (load_pixmap): Don't define away.

diff -r 388f412256c0 -r b9ea669835fc src/ChangeLog
--- a/src/ChangeLog	Fri Jul 02 15:47:02 2010 +0300
+++ b/src/ChangeLog	Fri Jul 02 16:05:59 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:
diff -r 388f412256c0 -r b9ea669835fc src/dosfns.h
--- a/src/dosfns.h	Fri Jul 02 15:47:02 2010 +0300
+++ b/src/dosfns.h	Fri Jul 02 16:05:59 2010 +0300
@@ -38,8 +38,8 @@
 #ifndef HAVE_X_WINDOWS
 extern Lisp_Object Vdos_display_scancodes;
 
-extern int         msdos_stdcolor_idx  P_ ((const char *));
-extern Lisp_Object msdos_stdcolor_name P_ ((int));
+extern int         msdos_stdcolor_idx  (const char *);
+extern Lisp_Object msdos_stdcolor_name (int);
 #endif
 
 /* arch-tag: a83b8c4c-63c8-451e-9e94-bc72e3e2f8bc
diff -r 388f412256c0 -r b9ea669835fc src/msdos.h
--- a/src/msdos.h	Fri Jul 02 15:47:02 2010 +0300
+++ b/src/msdos.h	Fri Jul 02 16:05:59 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)