HEAD broken for OSX- nsfsn.o fails to compile

[Randal L. Schwartz]

Last edit that touched this was Chong Yidong, on Mar 29.  Does
this ring any bells?

'
/System/Library/Frameworks/AppKit.framework/Headers/NSInputManager.h:23:
warning: previous declaration of '-(NSInteger)conversationIdentifier'
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/merlyn/MIRROR/emacs-GIT/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

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<address@hidden> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion