mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: move include directives before extern "C" wrapper

Browse source 
Adding extern "C" wrapper before includes (especially system ones) is
illadvised as the headers themselves can behave diffently in that case.

See the section "Including C Headers in C++ Code" in the following
http://www.oracle.com/technetwork/articles/servers-storage-dev/mixingcandcpluspluscode-305840.html

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Emil Velikov 2016-04-17 12:29:22 +01:00 • committed by Pekka Paalanen
parent ae78dcb1ad
commit 05f7aec1d5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scanner.c
View file

@ -1423,13 +1423,13 @@ emit_header(struct protocol *protocol, enum side side)
printf("#ifndef %s_%s_PROTOCOL_H\n" printf("#ifndef %s_%s_PROTOCOL_H\n"
"#define %s_%s_PROTOCOL_H\n" "#define %s_%s_PROTOCOL_H\n"
"\n" "\n"
"#include <stdint.h>\n"
"#include <stddef.h>\n"
"#include \"%s\"\n\n"
"#ifdef __cplusplus\n" "#ifdef __cplusplus\n"
"extern \"C\" {\n" "extern \"C\" {\n"
"#endif\n" "#endif\n"
"\n" "\n"
"#include <stdint.h>\n"
"#include <stddef.h>\n"
"#include \"%s\"\n\n"
"struct wl_client;\n" "struct wl_client;\n"
"struct wl_resource;\n\n", "struct wl_resource;\n\n",
protocol->uppercase_name, s, protocol->uppercase_name, s,