bug#6263: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

bug#6263: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

[Makoto Fujiwara]

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

bug#6263: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

[Eli Zaretskii]

> From: Makoto Fujiwara <makoto@ki.nu>
> Date: Tue, 25 May 2010 01:41:59 +0900
> Cc: 
> 
> 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)% 

When did you last update your source tree?  This problem was fixed 2
days ago.

bug#6263: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

[Makoto Fujiwara]

I think I had double checked but sorry, It's been
surely fixed, please close this report.

The my update was probably around 1500Z of 5/24,
(or may be 0000Z of 5/24) from git://repo.or.cz/emacs.git.

modena@makoto 00:30:18/100527(..emacs/.git)% ls -lt FETCH_HEAD 
-rw-r--r--  1 makoto  wheel  0 May 24 09:26 FETCH_HEAD
(JST is 0900 ahead of UTC)

Thank you.
---
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

bug#6263: [PATCH] 24.0.50; build fail at dispextern.h with LP64 machine

[Eli Zaretskii]

> Date: Thu, 27 May 2010 00:31:30 +0900
> From: Makoto Fujiwara <makoto@ki.nu>
> Cc: 
> 
> I think I had double checked but sorry, It's been
> surely fixed

No need to apologize.  Thanks for reporting this problem.

> please close this report.

Done.