Re: Emacs unicode 2 build failed

[Giorgos Keramidas]

On 2007-05-28 15:55, Kenichi Handa <address@hidden> wrote:
> In article <address@hidden>, "Herbert Euler" <address@hidden> writes:
> 
> > The error message is
> > gcc -c -D_BSD_SOURCE   -Demacs -DHAVE_CONFIG_H   -I. 
> > -I/home/xgp/src/emacs/newcvs/emacs/src -D_BSD_SOURCE  -g -O2  term.c
> > In file included from term.c:418:
> > buffer.h:403: redefinition of `struct buffer_text'
> > buffer.h:461: redefinition of `struct buffer'
> > make[1]: *** [term.o] Error 1
> > make[1]: Leaving directory `/home/xgp/src/emacs/newcvs/emacs/src'
> > make: *** [src] Error 2
> 
> > term.c includes buffer.h twice and there is no any protection in
> > buffer.h
> 
> I've just deleted the second include.

Wouldn't it be a `better' solution to add something like the following
to buffer.h, to avoid multiple inclusions of the header text?

%%%
diff -Nprc3 gnu.c9d9b15c47d7/src/buffer.h gnu/src/buffer.h
*** gnu.c9d9b15c47d7/src/buffer.h       Mon May 28 20:02:15 2007
--- gnu/src/buffer.h    Mon May 28 20:02:15 2007
*************** along with GNU Emacs; see the file COPYI
*** 19,24 ****
--- 19,26 ----
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.  */
  
+ #ifndef EMACS_BUFFER_H
+ #define       EMACS_BUFFER_H
  
  /* Accessing the parameters of the current buffer.  */
  
*************** extern int last_per_buffer_idx;
*** 1003,1005 ****
--- 1005,1009 ----
  
  /* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1
     (do not change this comment) */
+ 
+ #endif        /* EMACS_BUFFER_H */
%%%