|
From: Ethan M. <merritt@u.washington.edu> - 2005-05-15 19:18:02
|
On Sunday 15 May 2005 11:31 am, Per Persson wrote: > I'm on 10.4 now and the following change to post.h seems to fix the > build problems: > > --- term/post.h 2 Mar 2005 19:44:57 -0000 1.7 > +++ term/post.h 15 May 2005 18:20:22 -0000 > @@ -85,6 +85,6 @@ > #define EPSLATEX_HCHAR (11*PS_SC*6/10) > /* additional LaTeX header information for epslatex terminal */ > -extern char *epslatex_header; > +TERM_PUBLIC char *epslatex_header; > #endif /* TERM_POST_H */ It should be defined consistently, so please change it to TERM_PUBLIC in pslatex.trm also: =========================================================================== --- gnuplot/term/pslatex.trm 2005-05-09 22:51:37.000000000 -0700 +++ gnuplot-cvs/term/pslatex.trm 2005-05-15 12:10:49.937075896 -0700 @@ -99,6 +99,9 @@ TERM_PUBLIC void EPSLATEX_put_text __PROTO((unsigned int x, unsigned int y, const char *str)); TERM_PUBLIC void EPSLATEX_linetype __PROTO((int linetype)); +/* additional LaTeX header information for epslatex terminal */ +TERM_PUBLIC char *epslatex_header = NULL; + #endif /* TERM_PROTO */ @@ -116,9 +119,6 @@ static struct pstex_text_command *pstex_labels = NULL; -/* additional LaTeX header information for epslatex terminal */ -static char *epslatex_header = NULL; - /* Common functions for epslatex and ps(la)tex */ =========================================================================== > Am I right in assuming that using the 'extern' qualifier in post.h, > which will be pulled into term.c with the rest of the terminal stuff, > was never strictly correct and that gcc 4.0 now returns an error? It was never correct, insofar as this variable was never needed outside of the terminal drivers. But I don't see how gcc could know that. gcc is just complaining that the two declarations, static and extern, are inconsistent. -- Ethan A Merritt Biomolecular Structure Center University of Washington 98195-7742 |