diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-11-15 09:36:19 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-11-15 09:36:19 +0000 |
| commit | f3a66fc3f15340a68c90667657f0a7cfd52a72e9 (patch) | |
| tree | d5ec286a5444368e0975f5c605ddf9573e89a86e /src/libcroco/cr-additional-sel.c | |
| parent | color effects (diff) | |
| download | inkscape-f3a66fc3f15340a68c90667657f0a7cfd52a72e9.tar.gz inkscape-f3a66fc3f15340a68c90667657f0a7cfd52a72e9.zip | |
Make C++ - compilable. Mostly remove pointer casting problems. Fix a few places where C++ is stricter than C.
(bzr r1954)
Diffstat (limited to 'src/libcroco/cr-additional-sel.c')
| -rw-r--r-- | src/libcroco/cr-additional-sel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcroco/cr-additional-sel.c b/src/libcroco/cr-additional-sel.c index 9f511af06..80a4767e0 100644 --- a/src/libcroco/cr-additional-sel.c +++ b/src/libcroco/cr-additional-sel.c @@ -34,7 +34,7 @@ cr_additional_sel_new (void) { CRAdditionalSel *result = NULL; - result = g_try_malloc (sizeof (CRAdditionalSel)); + result = (CRAdditionalSel *)g_try_malloc (sizeof (CRAdditionalSel)); if (result == NULL) { cr_utils_trace_debug ("Out of memory"); @@ -219,7 +219,7 @@ cr_additional_sel_to_string (CRAdditionalSel * a_this) guchar *name = NULL; if (cur->content.class_name) { - name = g_strndup + name = (guchar *)g_strndup (cur->content.class_name->stryng->str, cur->content.class_name->stryng->len); @@ -239,7 +239,7 @@ cr_additional_sel_to_string (CRAdditionalSel * a_this) guchar *name = NULL; if (cur->content.class_name) { - name = g_strndup + name = (guchar *)g_strndup (cur->content.id_name->stryng->str, cur->content.id_name->stryng->len); @@ -295,7 +295,7 @@ cr_additional_sel_to_string (CRAdditionalSel * a_this) } if (str_buf) { - result = str_buf->str; + result = (guchar *)str_buf->str; g_string_free (str_buf, FALSE); str_buf = NULL; } @@ -319,7 +319,7 @@ cr_additional_sel_one_to_string (CRAdditionalSel *a_this) guchar *name = NULL; if (a_this->content.class_name) { - name = g_strndup + name = (guchar *)g_strndup (a_this->content.class_name->stryng->str, a_this->content.class_name->stryng->len); @@ -339,7 +339,7 @@ cr_additional_sel_one_to_string (CRAdditionalSel *a_this) guchar *name = NULL; if (a_this->content.class_name) { - name = g_strndup + name = (guchar *)g_strndup (a_this->content.id_name->stryng->str, a_this->content.id_name->stryng->len); @@ -394,7 +394,7 @@ cr_additional_sel_one_to_string (CRAdditionalSel *a_this) } if (str_buf) { - result = str_buf->str; + result = (guchar *)str_buf->str; g_string_free (str_buf, FALSE); str_buf = NULL; } |