Permalink
Browse files

Headerizer to fix build

  • Loading branch information...
1 parent 6c75c8d commit a40984c45231ed41779e9643023a4e943896fbec @Whiteknight Whiteknight committed May 6, 2012
Showing with 26 additions and 19 deletions.
  1. +5 −0 frontend/pbc_merge/main.c
  2. +10 −9 include/parrot/hash.h
  3. +11 −10 include/parrot/packfile.h
View
5 frontend/pbc_merge/main.c
@@ -65,6 +65,9 @@ typedef struct pbc_merge_input {
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+static void ensure_libdep(PARROT_INTERP, PackFile_ByteCode *bc, STRING *lib)
+ __attribute__nonnull__(1);
+
PARROT_DOES_NOT_RETURN
static void help(void);
@@ -151,6 +154,8 @@ static void pbc_merge_write(PARROT_INTERP,
__attribute__nonnull__(3)
FUNC_MODIFIES(*pf);
+#define ASSERT_ARGS_ensure_libdep __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_help __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
#define ASSERT_ARGS_pbc_fixup_bytecode __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
View
19 include/parrot/hash.h
@@ -133,6 +133,14 @@ void Parrot_hash_clone(PARROT_INTERP,
FUNC_MODIFIES(*dest);
PARROT_EXPORT
+PARROT_CANNOT_RETURN_NULL
+PARROT_WARN_UNUSED_RESULT
+Hash * Parrot_hash_create(PARROT_INTERP,
+ PARROT_DATA_TYPE val_type,
+ Hash_key_type hkey_type)
+ __attribute__nonnull__(1);
+
+PARROT_EXPORT
void Parrot_hash_delete(PARROT_INTERP,
ARGMOD(Hash *hash),
ARGIN_NULLOK(void *key))
@@ -262,13 +270,6 @@ void Parrot_hash_clone_prunable(PARROT_INTERP,
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
-Hash * Parrot_hash_create(PARROT_INTERP,
- PARROT_DATA_TYPE val_type,
- Hash_key_type hkey_type)
- __attribute__nonnull__(1);
-
-PARROT_CANNOT_RETURN_NULL
-PARROT_WARN_UNUSED_RESULT
Hash * Parrot_hash_create_sized(PARROT_INTERP,
PARROT_DATA_TYPE val_type,
Hash_key_type hkey_type,
@@ -406,6 +407,8 @@ STRING* Parrot_hash_value_to_string(PARROT_INTERP,
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(hash) \
, PARROT_ASSERT_ARG(dest))
+#define ASSERT_ARGS_Parrot_hash_create __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_hash_delete __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(hash))
@@ -458,8 +461,6 @@ STRING* Parrot_hash_value_to_string(PARROT_INTERP,
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(hash) \
, PARROT_ASSERT_ARG(dest))
-#define ASSERT_ARGS_Parrot_hash_create __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_hash_create_sized __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_hash_flatten_hash_into __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
View
21 include/parrot/packfile.h
@@ -722,6 +722,14 @@ PMC * Parrot_pf_subs_by_tag(PARROT_INTERP,
__attribute__nonnull__(3);
PARROT_EXPORT
+void Parrot_pf_tag_constant(PARROT_INTERP,
+ ARGIN(PackFile_ConstTable *ct),
+ const int tag_idx,
+ const int const_idx)
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_EXPORT
void Parrot_pf_write_pbc_file(PARROT_INTERP,
ARGIN(PMC *pf_pmc),
ARGIN(STRING *filename))
@@ -765,13 +773,6 @@ void Parrot_pf_mark_packfile(PARROT_INTERP, ARGMOD_NULLOK(PackFile * pf))
__attribute__nonnull__(1)
FUNC_MODIFIES(* pf);
-void Parrot_pf_tag_constant(PARROT_INTERP,
- ARGIN(PackFile_ConstTable *ct),
- const int tag_idx,
- const int const_idx)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
#define ASSERT_ARGS_do_sub_pragmas __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(pfpmc))
@@ -871,6 +872,9 @@ void Parrot_pf_tag_constant(PARROT_INTERP,
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(pfpmc) \
, PARROT_ASSERT_ARG(flag))
+#define ASSERT_ARGS_Parrot_pf_tag_constant __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp) \
+ , PARROT_ASSERT_ARG(ct))
#define ASSERT_ARGS_Parrot_pf_write_pbc_file __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(pf_pmc) \
@@ -893,9 +897,6 @@ void Parrot_pf_tag_constant(PARROT_INTERP,
, PARROT_ASSERT_ARG(pbc))
#define ASSERT_ARGS_Parrot_pf_mark_packfile __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_pf_tag_constant __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(ct))
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: src/packfile/api.c */

0 comments on commit a40984c

Please sign in to comment.