Permalink
Browse files

Fix c++ build

  • Loading branch information...
1 parent 51684dc commit 4e347b1e95e28128b2dd53fb6992e9ac48064ce6 @bacek bacek committed Oct 28, 2011
Showing with 16 additions and 8 deletions.
  1. +1 −1 include/parrot/interpreter.h
  2. +0 −2 include/parrot/scheduler_private.h
  3. +1 −0 src/extend.c
  4. +3 −3 src/interp/inter_cb.c
  5. +11 −2 src/pmc/pmclist.pmc
@@ -405,7 +405,7 @@ PMC* Parrot_make_cb(PARROT_INTERP,
PARROT_EXPORT
void Parrot_run_callback(PARROT_INTERP,
ARGMOD(PMC* user_data),
- ARGIN(char* external_data))
+ ARGIN(void* external_data))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3)
@@ -21,8 +21,6 @@ typedef enum {
SCHEDULER_in_handler_FLAG = PObj_private3_FLAG
} scheduler_flags_enum;
-void Parrot_pmc_list_insert_by_number(PARROT_INTERP, PMC *list, PMC *value);
-
#define SCHEDULER_get_FLAGS(o) (PObj_get_FLAGS(o))
#define SCHEDULER_flag_TEST(flag, o) (SCHEDULER_get_FLAGS(o) & SCHEDULER_ ## flag ## _FLAG)
#define SCHEDULER_flag_SET(flag, o) (SCHEDULER_get_FLAGS(o) |= SCHEDULER_ ## flag ## _FLAG)
View
@@ -67,6 +67,7 @@ GC and stackwalking, and the presence of an exception-handling infrastructure.
#include "parrot/parrot.h"
#include "parrot/extend.h"
+#include "parrot/events.h"
#include "pmc/pmc_sub.h"
#include "pmc/pmc_callcontext.h"
View
@@ -273,7 +273,7 @@ callback_CD(PARROT_INTERP, ARGIN(char *external_data), ARGMOD(PMC *user_data))
/*
-=item C<void Parrot_run_callback(PARROT_INTERP, PMC* user_data, char*
+=item C<void Parrot_run_callback(PARROT_INTERP, PMC* user_data, void*
external_data)>
Run a callback function. The PMC* user_data holds all
@@ -286,7 +286,7 @@ necessary items in its properties.
PARROT_EXPORT
void
Parrot_run_callback(PARROT_INTERP,
- ARGMOD(PMC* user_data), ARGIN(char* external_data))
+ ARGMOD(PMC* user_data), ARGIN(void* external_data))
{
ASSERT_ARGS(Parrot_run_callback)
PMC *signature;
@@ -337,7 +337,7 @@ Parrot_run_callback(PARROT_INTERP,
break;
case 't':
pasm_sig[1] = 'S';
- param = Parrot_str_new(interp, external_data, 0);
+ param = Parrot_str_new(interp, (const char*)external_data, 0);
break;
default:
Parrot_ex_throw_from_c_args(interp, NULL, 1,
View
@@ -19,6 +19,16 @@ all want to be O(1).
*/
+BEGIN_PMC_HEADER_PREAMBLE
+
+PARROT_EXPORT
+void
+Parrot_pmc_list_insert_by_number(PARROT_INTERP, PMC *list, PMC *value);
+
+END_PMC_HEADER_PREAMBLE
+
+
+
/* HEADERIZER HFILE: none */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
@@ -38,8 +48,6 @@ static void throw_shift_empty(PARROT_INTERP)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: static */
-void Parrot_pmc_list_insert_by_number(PARROT_INTERP, PMC *list, PMC *value);
-
/* It's a doubly linked list */
typedef struct PMC_List_Item {
@@ -497,6 +505,7 @@ Insert an item into a sorted list by its num value.
*/
+
PARROT_EXPORT
void
Parrot_pmc_list_insert_by_number(PARROT_INTERP, PMC *list, PMC *value)

0 comments on commit 4e347b1

Please sign in to comment.