[svn:parrot] r47297 - in branches/gc_massacre: include/parrot src/gc

[mikehh at svn.parrot.org]

Author: mikehh
Date: Wed Jun  2 12:16:17 2010
New Revision: 47297
URL: https://trac.parrot.org/parrot/changeset/47297

Log:
some headerizer changes

Modified:
   branches/gc_massacre/include/parrot/gc_api.h
   branches/gc_massacre/src/gc/gc_ms.c

Modified: branches/gc_massacre/include/parrot/gc_api.h
==============================================================================
--- branches/gc_massacre/include/parrot/gc_api.h	Wed Jun  2 11:59:31 2010	(r47296)
+++ branches/gc_massacre/include/parrot/gc_api.h	Wed Jun  2 12:16:17 2010	(r47297)
@@ -138,8 +138,9 @@
         FUNC_MODIFIES(*obj);
 
 PARROT_EXPORT
-void Parrot_gc_mark_STRING_alive_fun(SHIM_INTERP,
+void Parrot_gc_mark_STRING_alive_fun(PARROT_INTERP,
     ARGMOD_NULLOK(STRING *obj))
+        __attribute__nonnull__(1)
         FUNC_MODIFIES(*obj);
 
 PARROT_EXPORT
@@ -341,7 +342,8 @@
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(obj))
 #define ASSERT_ARGS_Parrot_gc_mark_STRING_alive_fun \
-     __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_gc_reallocate_memory_chunk \
      __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))

Modified: branches/gc_massacre/src/gc/gc_ms.c
==============================================================================
--- branches/gc_massacre/src/gc/gc_ms.c	Wed Jun  2 11:59:31 2010	(r47296)
+++ branches/gc_massacre/src/gc/gc_ms.c	Wed Jun  2 12:16:17 2010	(r47297)
@@ -151,7 +151,7 @@
 static unsigned int gc_ms_is_blocked_GC_sweep(PARROT_INTERP)
         __attribute__nonnull__(1);
 
-static int gc_ms_is_pmc_ptr(PARROT_INTERP, void *ptr)
+static int gc_ms_is_pmc_ptr(PARROT_INTERP, ARGIN_NULLOK(void *ptr))
         __attribute__nonnull__(1);
 
 static void gc_ms_mark_and_sweep(PARROT_INTERP, UINTVAL flags)