[PATCH wayland 2/3] server: move include directives before extern "C" wrapper

[Pekka Paalanen]

On Mon, 18 Apr 2016 08:16:37 +0200
Hardening <rdp.effort at gmail.com> wrote:

> Le 17/04/2016 13:29, Emil Velikov a écrit :
> > Analogous to previous commit but for the server(-core) header.
> > 
> > Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> > ---
> >  src/wayland-server-core.h | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/wayland-server-core.h b/src/wayland-server-core.h
> > index e8e1e9c..fa7f394 100644
> > --- a/src/wayland-server-core.h
> > +++ b/src/wayland-server-core.h
> > @@ -26,15 +26,15 @@
> >  #ifndef WAYLAND_SERVER_CORE_H
> >  #define WAYLAND_SERVER_CORE_H
> >  
> > -#ifdef  __cplusplus
> > -extern "C" {
> > -#endif
> > -
> >  #include <sys/types.h>
> >  #include <stdint.h>
> >  #include "wayland-util.h"
> >  #include "wayland-version.h"
> >  
> > +#ifdef  __cplusplus
> > +extern "C" {
> > +#endif
> > +
> >  enum {
> >  	WL_EVENT_READABLE = 0x01,
> >  	WL_EVENT_WRITABLE = 0x02,
> >   
> 
> Shouldn't the extern declaration be moved to surround only the functions
> declarations (and so not including type defines) ?
> That's just a question, if a C++ specialist have an answer...

That I am not quite sure if it has any effect. If it does have an
effect, then the C interpretation would be the correct one.

The important thing is to never include system headers from under
extern "C", which is what I inferred from
http://developers.redhat.com/blog/2016/02/29/why-cstdlib-is-more-complicated-than-you-might-think/
too (thanks, jadahl).

All three pushed:
   ae78dcb..2c8da32  master -> master


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 811 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20160419/af215170/attachment.sig>