[svn:parrot] r36683 - in trunk: include/parrot src src/packfile

[rurban at svn.parrot.org]

Author: rurban
Date: Fri Feb 13 19:46:30 2009
New Revision: 36683
URL: https://trac.parrot.org/parrot/changeset/36683

Log:
Fix make headerizer from r36680. undefine TRACE_PACKFILE

Modified:
   trunk/include/parrot/packfile.h
   trunk/src/packfile.c
   trunk/src/packfile/pf_items.c

Modified: trunk/include/parrot/packfile.h
==============================================================================
--- trunk/include/parrot/packfile.h	Fri Feb 13 19:33:27 2009	(r36682)
+++ trunk/include/parrot/packfile.h	Fri Feb 13 19:46:30 2009	(r36683)
@@ -30,9 +30,9 @@
 #define FLOATTYPE_12_NAME     "x86 little endian 12 byte long double"
 #define FLOATTYPE_MAX         1
 
-#define TRACE_PACKFILE 2
+#define TRACE_PACKFILE 0
+
 #if TRACE_PACKFILE
-void Parrot_trace_eprintf(ARGIN(const char *s), ...);
 #  define TRACE_PRINTF(args)       if (pf->options) Parrot_trace_eprintf args
 #  if TRACE_PACKFILE == 2
 #    define TRACE_PRINTF_VAL(args) if (pf->options & 2) Parrot_trace_eprintf args
@@ -776,6 +776,9 @@
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*seg);
 
+void Parrot_trace_eprintf(ARGIN(const char *s), ...)
+        __attribute__nonnull__(1);
+
 #define ASSERT_ARGS_do_sub_pragmas __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(self)
@@ -923,6 +926,8 @@
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(seg) \
     || PARROT_ASSERT_ARG(cursor)
+#define ASSERT_ARGS_Parrot_trace_eprintf __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(s)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: src/packfile.c */
 
@@ -1118,13 +1123,6 @@
         __attribute__nonnull__(2)
         FUNC_MODIFIES(*rb);
 
-void fetch_buf_be_32(
-    ARGOUT(unsigned char *rb),
-    ARGIN(const unsigned char *b))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        FUNC_MODIFIES(*rb);
-
 void fetch_buf_be_4(
     ARGOUT(unsigned char *rb),
     ARGIN(const unsigned char *b))
@@ -1153,13 +1151,6 @@
         __attribute__nonnull__(2)
         FUNC_MODIFIES(*rb);
 
-void fetch_buf_le_32(
-    ARGOUT(unsigned char *rb),
-    ARGIN(const unsigned char *b))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        FUNC_MODIFIES(*rb);
-
 void fetch_buf_le_4(
     ARGOUT(unsigned char *rb),
     ARGIN(const unsigned char *b))
@@ -1196,9 +1187,6 @@
 #define ASSERT_ARGS_fetch_buf_be_16 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(rb) \
     || PARROT_ASSERT_ARG(b)
-#define ASSERT_ARGS_fetch_buf_be_32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(rb) \
-    || PARROT_ASSERT_ARG(b)
 #define ASSERT_ARGS_fetch_buf_be_4 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(rb) \
     || PARROT_ASSERT_ARG(b)
@@ -1211,9 +1199,6 @@
 #define ASSERT_ARGS_fetch_buf_le_16 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(rb) \
     || PARROT_ASSERT_ARG(b)
-#define ASSERT_ARGS_fetch_buf_le_32 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(rb) \
-    || PARROT_ASSERT_ARG(b)
 #define ASSERT_ARGS_fetch_buf_le_4 __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(rb) \
     || PARROT_ASSERT_ARG(b)

Modified: trunk/src/packfile.c
==============================================================================
--- trunk/src/packfile.c	Fri Feb 13 19:33:27 2009	(r36682)
+++ trunk/src/packfile.c	Fri Feb 13 19:46:30 2009	(r36683)
@@ -457,7 +457,9 @@
     (cursor) += ROUND_16((const char *)(cursor) - (const char *)(st))/sizeof (opcode_t)
 
 #if TRACE_PACKFILE
-void Parrot_trace_eprintf(ARGIN(const char *s), ...) {
+void
+Parrot_trace_eprintf(ARGIN(const char *s), ...)
+{
     va_list args;
     va_start(args, s);
     vfprintf(stderr, s, args);

Modified: trunk/src/packfile/pf_items.c
==============================================================================
--- trunk/src/packfile/pf_items.c	Fri Feb 13 19:33:27 2009	(r36682)
+++ trunk/src/packfile/pf_items.c	Fri Feb 13 19:46:30 2009	(r36683)
@@ -114,10 +114,6 @@
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: static */
 
-#if TRACE_PACKFILE
-void Parrot_trace_eprintf(ARGIN(const char *s), ...);
-#endif
-
 /*
  * round val up to whole size, return result in bytes
  */