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 --git a/src/ChangeLog b/src/ChangeLog
index b36953e23f3014a279a356cfc93b162acfaab60e..df33303b90ff5f3da5e79b161abe7648b240c089 100644 (file)
--- 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/dosfns.h b/src/dosfns.h
index 1759ffd8a90aefdd6637245e21cf5128e28952c0..820b6b30e43f48a36612ff7f19898190e02b30e1 100644 (file)
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -38,8 +38,8 @@ extern Lisp_Object Vdos_windows_version;
 #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 --git a/src/msdos.h b/src/msdos.h
index 3ace5123227c76c840c65f4d349b05e9ef538c24..5f8b5e725322e73e8d70ab38a59e6f2085d99a20 100644 (file)
--- 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)