diff options
| author | Giulio Camuffo <giuliocamuffo@gmail.com> | 2013-03-28 18:02:42 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-03-28 14:03:58 -0400 |
| commit | 7fe01b18d89ad8d59d0c6285d37e70004606b76f (patch) | |
| tree | 8af75035816811e3af6fae64123edc3aed61de68 /shared | |
| parent | b5bae3450c2970d0643d55467de0709bb0790940 (diff) | |
sdk: be C++ friendly
This renames the weston_surface's private member to configure_private
and externs "C" the headers of the SDK.
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/config-parser.h | 8 | ||||
| -rw-r--r-- | shared/matrix.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/shared/config-parser.h b/shared/config-parser.h index 314057ae..1d0ee3fc 100644 --- a/shared/config-parser.h +++ b/shared/config-parser.h @@ -23,6 +23,10 @@ #ifndef CONFIGPARSER_H #define CONFIGPARSER_H +#ifdef __cplusplus +extern "C" { +#endif + enum config_key_type { CONFIG_KEY_INTEGER, /* typeof data = int */ CONFIG_KEY_UNSIGNED_INTEGER, /* typeof data = unsigned int */ @@ -69,5 +73,9 @@ int parse_options(const struct weston_option *options, int count, int *argc, char *argv[]); +#ifdef __cplusplus +} +#endif + #endif /* CONFIGPARSER_H */ diff --git a/shared/matrix.h b/shared/matrix.h index 47354f6a..e5cf636b 100644 --- a/shared/matrix.h +++ b/shared/matrix.h @@ -24,6 +24,10 @@ #ifndef WESTON_MATRIX_H #define WESTON_MATRIX_H +#ifdef __cplusplus +extern "C" { +#endif + enum weston_matrix_transform_type { WESTON_MATRIX_TRANSFORM_TRANSLATE = (1 << 0), WESTON_MATRIX_TRANSFORM_SCALE = (1 << 1), @@ -71,4 +75,8 @@ inverse_transform(const double *LU, const unsigned *p, float *v); # define MATRIX_TEST_EXPORT static #endif +#ifdef __cplusplus +} +#endif + #endif /* WESTON_MATRIX_H */ |