bug#5814: 23.1.93; Compile Emacs on Mac OS 10.4

bug#5814: 23.1.93; Compile Emacs on Mac OS 10.4

[Alex Schroeder]

I just tried to build Emacs on my desktop running Mac OS 10.4.

At first I just ran make again in my source directory, then I tried
./configure --with-ns and make again, but in both cases the build did
not go through and ended with the following:

gcc -c  -Demacs -DHAVE_CONFIG_H  -I. -I/Users/alex/Source/emacs/quickfixes/src -Dtemacs     -g -O2 -Wdeclaration-after-statement -Wno-pointer-sign   -MMD -MF deps/nsterm.d nsterm.m
nsterm.m: In function 'x_set_window_size':
nsterm.m:1192: warning: ISO C90 forbids mixed declarations and code
nsterm.m: In function 'ns_draw_fringe_bitmap':
nsterm.m:2203: warning: ISO C90 forbids mixed declarations and code
nsterm.m: In function '-[EmacsScroller judge]':
nsterm.m:5761: warning: ISO C90 forbids mixed declarations and code
gcc -c  -Demacs -DHAVE_CONFIG_H  -I. -I/Users/alex/Source/emacs/quickfixes/src -Dtemacs     -g -O2 -Wdeclaration-after-statement -Wno-pointer-sign   -MMD -MF deps/nsfns.d nsfns.m
nsfns.m: In function 'ns_get_screen':
nsfns.m:227: warning: assignment makes pointer from integer without a cast
nsfns.m: At top level:
nsfns.m:690: error: conflicting types for 'ns_set_doc_edited'
nsterm.h:712: error: previous declaration of 'ns_set_doc_edited' was here
nsfns.m: In function 'Fx_display_color_cells':
nsfns.m:2377: warning: ISO C90 forbids mixed declarations and code
make[1]: *** [nsfns.o] Error 1
make: *** [src] Error 2

bug#5814: patch?

[Alex Schröder]

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

Without understanding what I'm doing, the following change seems to allow
the build process to continue:

=== modified file 'src/nsfns.m'
*** src/nsfns.m    2010-03-29 23:48:44 +0000
--- src/nsfns.m    2010-03-31 20:09:42 +0000
***************
*** 686,692 ****


  void
! ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
  {
    NSView *view = FRAME_NS_VIEW (f);
    NSAutoreleasePool *pool;
--- 686,692 ----


  void
! ns_set_doc_edited (struct frame *f, Lisp_Object arg)
  {
    NSView *view = FRAME_NS_VIEW (f);
    NSAutoreleasePool *pool;

[-- Attachment #2: Type: text/html, Size: 672 bytes --]

bug#5814: 23.1.93; Compile Emacs on Mac OS 10.4

[Glenn Morris]

Under discussion in

http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01440.html

bug#5814: 23.1.93; Compile Emacs on Mac OS 10.4

[Chong Yidong]

I've merged the fix from the branch.