I have applied your changes, but now it fail to compile:
,----
| window.c:81: error: static declaration of ‘foreach_window’ follows non-static
declaration
| window.h:799: note: previous declaration of ‘foreach_window’ was here
| window.c: In function ‘Fcoordinates_in_window_p’:
| window.c:1011: error: ‘Qleft_margin’ undeclared (first use in this function)
| window.c:1011: error: (Each undeclared identifier is reported only once
| window.c:1011: error: for each function it appears in.)
| window.c:1014: error: ‘Qright_margin’ undeclared (first use in this function)
| window.c: At top level:
| window.c:1080: error: conflicting types for ‘window_from_coordinates’
| window.h:787: note: previous declaration of ‘window_from_coordinates’ was here
| window.c:1436: error: static declaration of ‘delete_window’ follows
non-static declaration
| window.h:786: note: previous declaration of ‘delete_window’ was here
| window.c:3982: error: static declaration of ‘window_height’ follows
non-static declaration
| window.h:791: note: previous declaration of ‘window_height’ was here
| window.c:3989: error: static declaration of ‘window_width’ follows non-static
declaration
| window.h:792: note: previous declaration of ‘window_width’ was here
| make[1]: *** [window.o] Erreur 1
| make[1]: quittant le répertoire « /home/thierry/download/emacs-23/src »
| make: *** [src] Erreur 2
`----