Hi, On Fri, May 31, 2013 at 8:14 AM, Martin Minarik < minari...@student.fiit.stuba.sk> wrote: > > diff --git a/src/extensions/weston/weston-wfits.cpp > b/src/extensions/weston/weston-wfits.cpp > index a54e0fe..96cf617 100644 > --- a/src/extensions/weston/weston-wfits.cpp > +++ b/src/extensions/weston/weston-wfits.cpp > @@ -42,6 +42,10 @@ extern "C" { > #undef private > } > > +extern "C" { > +#include <weston/evdev.h> > +} >
Header files that could be potentially exposed to C++ really should be C++ friendly. If evdev.h is going to be exported as part of the Weston SDK it should contain the appropriate extern "C" block. Something like the following should work: diff --git a/src/evdev.h b/src/evdev.h index eb5c868..46a0798 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -26,6 +26,10 @@ #include <linux/input.h> #include <wayland-util.h> +#ifdef __cplusplus +extern "C" { +#endif + #define MAX_SLOTS 16 enum evdev_event_type { @@ -124,4 +128,9 @@ void evdev_notify_keyboard_focus(struct weston_seat *seat, struct wl_list *evdev_devices); +#ifdef __cplusplus +} +#endif + #endif /* EVDEV_H */ You then won't need to wrap the #include <weston/evdev.h> with an extern "C" block. -Ossama
_______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel