From 1dc76af7bff6c31ab7b5da4954fa5573144d9fb1 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 26 Feb 2014 16:57:08 +0000
Subject: [PATCH] py: Remove name of var arg from macros with var args.
---
py/compile.c | 2 +-
py/emitcommon.c | 2 +-
py/malloc.c | 2 +-
py/obj.h | 1 -
py/qstr.c | 2 +-
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/py/compile.c b/py/compile.c
index 9be90a601..6a87236b9 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2509,7 +2509,7 @@ STATIC compile_function_t compile_function[] = {
NULL,
#define nc NULL
#define c(f) compile_##f
-#define DEF_RULE(rule, comp, kind, arg...) comp,
+#define DEF_RULE(rule, comp, kind, ...) comp,
#include "grammar.h"
#undef nc
#undef c
diff --git a/py/emitcommon.c b/py/emitcommon.c
index bfcdad797..ff6457289 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -13,7 +13,7 @@
#include "runtime0.h"
#include "emit.h"
-#define EMIT(fun, arg...) (emit_method_table->fun(emit, ##arg))
+#define EMIT(fun, ...) (emit_method_table->fun(emit, __VA_ARGS__))
void emit_common_load_id(emit_t *emit, const emit_method_table_t *emit_method_table, scope_t *scope, qstr qstr) {
// assumes pass is greater than 1, ie that all identifiers are defined in the scope
diff --git a/py/malloc.c b/py/malloc.c
index 41cf1fd13..27eaac108 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -8,7 +8,7 @@
#if 0 // print debugging info
#define DEBUG_printf DEBUG_printf
#else // don't print debugging info
-#define DEBUG_printf(args...) (void)0
+#define DEBUG_printf(...) (void)0
#endif
#if MICROPY_MEM_STATS
diff --git a/py/obj.h b/py/obj.h
index 88202bbcc..c21c85959 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -75,7 +75,6 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
// Need to declare this here so we are not dependent on map.h
struct _mp_map_t;
struct _mp_map_elem_t;
-enum _mp_map_lookup_kind_t;
// Type definitions for methods
diff --git a/py/qstr.c b/py/qstr.c
index a34479cbf..aebc2921c 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -12,7 +12,7 @@
#if 0 // print debugging info
#define DEBUG_printf DEBUG_printf
#else // don't print debugging info
-#define DEBUG_printf(args...) (void)0
+#define DEBUG_printf(...) (void)0
#endif
// A qstr is an index into the qstr pool.
--
GitLab