Permalink
Browse files

Revert 830e791; it broke the build.

Developers:  Please don't commit to master if you haven't run 'make test'.
  • Loading branch information...
1 parent f6ed02d commit 3ccd61d01e7cf1a3241fc84e8f4595c8f8b72787 @jkeenan jkeenan committed May 7, 2012
Showing with 18 additions and 11 deletions.
  1. +10 −3 include/parrot/api.h
  2. +8 −8 src/embed/strings.c
View
@@ -27,6 +27,13 @@ PARROT_WARN_UNUSED_RESULT
PARROT_CONST_FUNCTION
size_t get_program_code_size(void);
+/* Forward declaration of Parrot_confess. We can't include exceptions.h yet */
+PARROT_EXPORT
+PARROT_DOES_NOT_RETURN
+PARROT_COLD
+void
+Parrot_confess(ARGIN(const char *cond), ARGIN(const char *file), unsigned int line);
+
#define PARROT_API PARROT_EXPORT
/* having a modified version of PARROT_ASSERT which resolves as an integer
@@ -392,14 +399,14 @@ Parrot_Int Parrot_api_string_export_wchar(
PARROT_API
Parrot_Int Parrot_api_string_free_exported_ascii(
ARGIN(Parrot_PMC interp_pmc),
- ARGIN(char *str))
+ ARGIN(char * const str))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_API
Parrot_Int Parrot_api_string_free_exported_wchar(
ARGIN(Parrot_PMC interp_pmc),
- ARGIN(wchar_t *str))
+ ARGIN(wchar_t * const str))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -439,7 +446,7 @@ Parrot_Int Parrot_api_string_import_binary(
PARROT_API
Parrot_Int Parrot_api_string_import_wchar(
ARGIN(Parrot_PMC interp_pmc),
- ARGIN(const wchar_t *str),
+ ARGIN(wchar_t * str),
ARGOUT(Parrot_String * out))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
View
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2010-2012, Parrot Foundation.
+Copyright (C) 2010, Parrot Foundation.
=head1 NAME
@@ -53,7 +53,7 @@ Parrot_api_string_export_ascii(ARGIN(Parrot_PMC interp_pmc), ARGIN(Parrot_String
/*
=item C<Parrot_Int Parrot_api_string_free_exported_ascii(Parrot_PMC interp_pmc,
-char *str)>
+char * const str)>
Releases the allocated memory for C<str>. This function returns a true value if
this call is successful and false value otherwise.
@@ -64,7 +64,7 @@ this call is successful and false value otherwise.
PARROT_API
Parrot_Int
-Parrot_api_string_free_exported_ascii(ARGIN(Parrot_PMC interp_pmc), ARGIN(char *str))
+Parrot_api_string_free_exported_ascii(ARGIN(Parrot_PMC interp_pmc), ARGIN(char * const str))
{
ASSERT_ARGS(Parrot_api_string_free_exported_ascii)
EMBED_API_CALLIN(interp_pmc, interp);
@@ -112,7 +112,7 @@ Parrot_api_string_export_wchar(ARGIN(Parrot_PMC interp_pmc), ARGIN(Parrot_String
/*
=item C<Parrot_Int Parrot_api_string_free_exported_wchar(Parrot_PMC interp_pmc,
-wchar_t *str)>
+wchar_t * const str)>
Releases the allocated memory for C<str>. This function returns a true value if
this call is successful and false value otherwise.
@@ -123,7 +123,7 @@ this call is successful and false value otherwise.
PARROT_API
Parrot_Int
-Parrot_api_string_free_exported_wchar(ARGIN(Parrot_PMC interp_pmc), ARGIN(wchar_t *str))
+Parrot_api_string_free_exported_wchar(ARGIN(Parrot_PMC interp_pmc), ARGIN(wchar_t * const str))
{
ASSERT_ARGS(Parrot_api_string_free_exported_wchar)
EMBED_API_CALLIN(interp_pmc, interp)
@@ -182,8 +182,8 @@ Parrot_api_string_import_ascii(ARGIN(Parrot_PMC interp_pmc), ARGIN(const char *
/*
-=item C<Parrot_Int Parrot_api_string_import_wchar(Parrot_PMC interp_pmc, const
-wchar_t *str, Parrot_String * out)>
+=item C<Parrot_Int Parrot_api_string_import_wchar(Parrot_PMC interp_pmc, wchar_t
+* str, Parrot_String * out)>
Transforms wchar string C<str> into a Parrot_String and stores the result in
C<out>. This function returns a true value if this call is successful and false
@@ -195,7 +195,7 @@ value otherwise.
PARROT_API
Parrot_Int
-Parrot_api_string_import_wchar(ARGIN(Parrot_PMC interp_pmc), ARGIN(const wchar_t *str),
+Parrot_api_string_import_wchar(ARGIN(Parrot_PMC interp_pmc), ARGIN(wchar_t * str),
ARGOUT(Parrot_String * out))
{
ASSERT_ARGS(Parrot_api_string_import_wchar)

0 comments on commit 3ccd61d

Please sign in to comment.