Subject: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

From: Makoto Fujiwara <[email-masked]>
Date: Tue, 25 May 2010 01:41:59 +0900

I am building 24.0.50 on NetBSD/amd64 and getting
Following problem. It is LP64 defined machine
(EMACS_INT = long)

---------
/export/git-work/emacs/src/xdisp.c: In function 'init_iterator':
/export/git-work/emacs/src/xdisp.c:2604: error: argument 'charpos' doesn't match prototype
/export/git-work/emacs/src/dispextern.h:2914: error: prototype declaration
/export/git-work/emacs/src/xdisp.c:2604: error: argument 'bytepos' doesn't match prototype
/export/git-work/emacs/src/dispextern.h:2914: error: prototype declaration
gmake[1]: *** [xdisp.o] Error 1
gmake[1]: Leaving directory `/export/git-work/emacs-work/src'
gmake: *** [src] Error 2
modena@makoto 01:40:33/100525(..git-work/emacs)% 
---------

It seems to me the patch is necessary:

diff --git a/src/dispextern.h b/src/dispextern.h
index ce8527b..2c2463f 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2911,8 +2911,8 @@ void mark_window_display_accurate P_ ((Lisp_Object, int));
 void redisplay_preserve_echo_area P_ ((int));
 int set_cursor_from_row P_ ((struct window *, struct glyph_row *,
 			     struct glyph_matrix *, int, int, int, int));
-void init_iterator P_ ((struct it *, struct window *, int,
-			int, struct glyph_row *, enum face_id));
+void init_iterator P_ ((struct it *, struct window *, EMACS_INT,
+			EMACS_INT, struct glyph_row *, enum face_id));
 void init_iterator_to_row_start P_ ((struct it *, struct window *,
 				     struct glyph_row *));
 int get_next_display_element P_ ((struct it *));
---
Makoto Fujiwara