From 3541ce862727a967c92f7f08e3c7da16522f89ef Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sat, 23 Oct 2010 23:00:21 +0000 Subject: Sprinkle some C++ scoping around svn path=/trunk/libcss/; revision=10901 --- include/libcss/computed.h | 9 +++++++++ include/libcss/errors.h | 9 +++++++++ include/libcss/fpmath.h | 9 +++++++++ include/libcss/functypes.h | 9 +++++++++ include/libcss/hint.h | 9 +++++++++ include/libcss/libcss.h | 9 +++++++++ include/libcss/properties.h | 9 +++++++++ include/libcss/select.h | 9 +++++++++ include/libcss/stylesheet.h | 9 +++++++++ include/libcss/types.h | 9 +++++++++ 10 files changed, 90 insertions(+) (limited to 'include') diff --git a/include/libcss/computed.h b/include/libcss/computed.h index 2428fce..818d9db 100644 --- a/include/libcss/computed.h +++ b/include/libcss/computed.h @@ -8,6 +8,11 @@ #ifndef libcss_computed_h_ #define libcss_computed_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include @@ -2177,4 +2182,8 @@ static inline uint8_t css_computed_text_align( #undef CSS_TEXT_ALIGN_SHIFT #undef CSS_TEXT_ALIGN_INDEX +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/errors.h b/include/libcss/errors.h index 3177400..0598834 100644 --- a/include/libcss/errors.h +++ b/include/libcss/errors.h @@ -8,6 +8,11 @@ #ifndef libcss_errors_h_ #define libcss_errors_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include typedef enum css_error { @@ -27,5 +32,9 @@ typedef enum css_error { /* Convert a libcss error value to a string */ const char *css_error_to_string(css_error error); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/fpmath.h b/include/libcss/fpmath.h index 8b867f8..3867f3a 100644 --- a/include/libcss/fpmath.h +++ b/include/libcss/fpmath.h @@ -8,6 +8,11 @@ #ifndef libcss_fpmath_h_ #define libcss_fpmath_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include /* 22:10 fixed point math */ @@ -57,5 +62,9 @@ typedef int32_t css_fixed; #define F_300 0x0004b000 /* 300 */ #define F_400 0x00064000 /* 400 */ +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/functypes.h b/include/libcss/functypes.h index c091f0b..2acd44a 100644 --- a/include/libcss/functypes.h +++ b/include/libcss/functypes.h @@ -8,6 +8,11 @@ #ifndef libcss_functypes_h_ #define libcss_functypes_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include #include @@ -17,5 +22,9 @@ /* Type of allocation function for libcss */ typedef void *(*css_allocator_fn)(void *ptr, size_t size, void *pw); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/hint.h b/include/libcss/hint.h index 363534f..917794a 100644 --- a/include/libcss/hint.h +++ b/include/libcss/hint.h @@ -8,6 +8,11 @@ #ifndef libcss_hint_h_ #define libcss_hint_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include @@ -46,4 +51,8 @@ typedef struct css_hint { uint8_t status; } css_hint; +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/libcss.h b/include/libcss/libcss.h index e3eb0ec..9ab6149 100644 --- a/include/libcss/libcss.h +++ b/include/libcss/libcss.h @@ -8,6 +8,11 @@ #ifndef libcss_h_ #define libcss_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include @@ -25,5 +30,9 @@ css_error css_initialise(const char *aliases_file, /* Clean up after LibCSS */ css_error css_finalise(css_allocator_fn alloc, void *pw); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/properties.h b/include/libcss/properties.h index 91d1dab..0c139a3 100644 --- a/include/libcss/properties.h +++ b/include/libcss/properties.h @@ -8,6 +8,11 @@ #ifndef libcss_properties_h_ #define libcss_properties_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + enum css_properties_e { CSS_PROP_AZIMUTH = 0x000, CSS_PROP_BACKGROUND_ATTACHMENT = 0x001, @@ -599,4 +604,8 @@ enum css_z_index_e { CSS_Z_INDEX_AUTO = 0x2 }; +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/select.h b/include/libcss/select.h index 72e9767..a5d6111 100644 --- a/include/libcss/select.h +++ b/include/libcss/select.h @@ -8,6 +8,11 @@ #ifndef libcss_select_h_ #define libcss_select_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include @@ -102,4 +107,8 @@ css_error css_select_style(css_select_ctx *ctx, void *node, css_computed_style *result, css_select_handler *handler, void *pw); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/stylesheet.h b/include/libcss/stylesheet.h index b9cb5ab..32e8d00 100644 --- a/include/libcss/stylesheet.h +++ b/include/libcss/stylesheet.h @@ -8,6 +8,11 @@ #ifndef libcss_stylesheet_h_ #define libcss_stylesheet_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include @@ -53,5 +58,9 @@ css_error css_stylesheet_set_disabled(css_stylesheet *sheet, bool disabled); css_error css_stylesheet_size(css_stylesheet *sheet, size_t *size); +#ifdef __cplusplus +} +#endif + #endif diff --git a/include/libcss/types.h b/include/libcss/types.h index 1a9fbba..7c2e7f2 100644 --- a/include/libcss/types.h +++ b/include/libcss/types.h @@ -8,6 +8,11 @@ #ifndef libcss_types_h_ #define libcss_types_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include #include #include @@ -101,4 +106,8 @@ typedef struct css_select_ctx css_select_ctx; typedef struct css_computed_style css_computed_style; +#ifdef __cplusplus +} +#endif + #endif -- cgit v1.2.3