Re: [dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread Nils R
Roberto E. Vargas Caballero schrieb am 06.06.2014 15:22: > On Fri, Jun 06, 2014 at 03:18:03PM +0200, Martin Kopta wrote: >> On Fri, Jun 06, 2014 at 01:55:17PM +0200, Nils R wrote: >> > in commit c6fcb78b3a9a73b691875048848430c18870a0fc[1], Colourmap was >> > renamed >> to the >> > american versi

Re: [dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread Roberto E. Vargas Caballero
On Fri, Jun 06, 2014 at 03:18:03PM +0200, Martin Kopta wrote: > On Fri, Jun 06, 2014 at 01:55:17PM +0200, Nils R wrote: > > in commit c6fcb78b3a9a73b691875048848430c18870a0fc[1], Colourmap was > > renamed to the > > american version "Colormap", which is already defined in openbsds X.h: > > > >

Re: [dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread Martin Kopta
On Fri, Jun 06, 2014 at 01:55:17PM +0200, Nils R wrote: > in commit c6fcb78b3a9a73b691875048848430c18870a0fc[1], Colourmap was renamed > to the > american version "Colormap", which is already defined in openbsds X.h: > > st.c:183: error: redefinition of typedef 'Colormap' > /usr/X11R6/includ

Re: [dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread FRIGN
On Fri, 6 Jun 2014 13:55:17 +0200 (CEST) "Nils R" wrote: > My patch below solves it for me, but i only tested on openbsd. Here's the improved patch without falling back to using "Colour" and just removing the typedef instead. Thanks for reporting this issue! Cheers FRIGN -- FRIGN >From c3e

Re: [dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread FRIGN
On Fri, 6 Jun 2014 13:55:17 +0200 (CEST) "Nils R" wrote: > Any thoughts? > -typedef Colormap Colormap; > +typedef Colormap Colourmap; > > typedef struct { > char c[UTF_SIZ]; /* character code */ > @@ -241,7 +241,7 @@ typedef struct { > /* Purely graphic info */ > typedef struct { >

[dev] [st] latest git fails to compile on openbsd

2014-06-06 Thread Nils R
Hi dev@, in commit c6fcb78b3a9a73b691875048848430c18870a0fc[1], Colourmap was renamed to the american version "Colormap", which is already defined in openbsds X.h: st.c:183: error: redefinition of typedef 'Colormap' /usr/X11R6/include/X11/X.h:104: error: previous declaration of 'Colormap' w