From: Eli Zaretskii Date: Fri, 2 Jul 2010 13:05:59 +0000 (+0300) Subject: Fix the MS-DOS build due to removal of P_. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81^2~64^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c0b36d462b35a23b5cfc3f7e15e9c15f29f72306;p=emacs.git 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 b36953e23f3..df33303b90f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/dosfns.h b/src/dosfns.h index 1759ffd8a90..820b6b30e43 100644 --- 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 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)