diff options
| author | Eli Zaretskii | 2010-07-02 16:10:00 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-07-02 16:10:00 +0300 |
| commit | 4f15a3709165621d5628ff3aae927e0bbb1c42cf (patch) | |
| tree | ca6248b55ce6ca9a1fd534ef333ed57a3316c285 /src | |
| parent | 9e892c8d8b52fbc4bc484fb8a185496f34bff805 (diff) | |
| parent | c0b36d462b35a23b5cfc3f7e15e9c15f29f72306 (diff) | |
| download | emacs-4f15a3709165621d5628ff3aae927e0bbb1c42cf.tar.gz emacs-4f15a3709165621d5628ff3aae927e0bbb1c42cf.zip | |
Fix MS-DOS build due to removal of P_.
msdos.h (load_pixmap): Don't define away.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/msdos.h | 1 |
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 @@ | |||
| 1 | 2010-07-02 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * dosfns.h (msdos_stdcolor_idx, msdos_stdcolor_name): Remove P_ | ||
| 4 | from prototypes. | ||
| 5 | |||
| 6 | * msdos.h (load_pixmap): Don't define away. | ||
| 7 | |||
| 1 | 2010-07-02 Jan Djärv <jan.h.d@swipnet.se> | 8 | 2010-07-02 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 9 | ||
| 3 | * lisp.h: | 10 | * 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 *); | |||
| 76 | 76 | ||
| 77 | #define XFreeGC (void) | 77 | #define XFreeGC (void) |
| 78 | #define x_destroy_bitmap(p1,p2) | 78 | #define x_destroy_bitmap(p1,p2) |
| 79 | #define load_pixmap(p1,p2,p3,p4) (0) | ||
| 80 | #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9) | 79 | #define XGetGeometry(p1,p2,p3,p4,p5,p6,p7,p8,p9) |
| 81 | #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) | 80 | #define DisplayWidth(p1,p2) (SELECTED_FRAME()->text_cols) |
| 82 | #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines) | 81 | #define DisplayHeight(p1,p2) (SELECTED_FRAME()->text_lines) |