From 786ed3cf84a9fa03ee484c70971de672585a4af3 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Wed, 9 Sep 2009 21:09:42 +0000 Subject: [PATCH] Fixed sdcc compiler problem: function pointers cannot be NULL, so added a dummy function instead --- core/net/rime/chameleon-bitopt.c | 10 ++++++++-- core/net/rime/chameleon-raw.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/core/net/rime/chameleon-bitopt.c b/core/net/rime/chameleon-bitopt.c index 9a17fa19d..063014f7d 100644 --- a/core/net/rime/chameleon-bitopt.c +++ b/core/net/rime/chameleon-bitopt.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: chameleon-bitopt.c,v 1.7 2009/03/12 21:58:20 adamdunkels Exp $ + * $Id: chameleon-bitopt.c,v 1.8 2009/09/09 21:09:42 adamdunkels Exp $ */ /** @@ -331,12 +331,18 @@ unpack_header(void) bitptr += len; } return c; +} +/*---------------------------------------------------------------------------*/ +static void +init(void) +{ + } /*---------------------------------------------------------------------------*/ CC_CONST_FUNCTION struct chameleon_module chameleon_bitopt = { unpack_header, pack_header, header_size, - NULL + init }; /*---------------------------------------------------------------------------*/ diff --git a/core/net/rime/chameleon-raw.c b/core/net/rime/chameleon-raw.c index 4e9404eb4..02b2d0a7a 100644 --- a/core/net/rime/chameleon-raw.c +++ b/core/net/rime/chameleon-raw.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: chameleon-raw.c,v 1.6 2009/03/12 21:58:20 adamdunkels Exp $ + * $Id: chameleon-raw.c,v 1.7 2009/09/09 21:09:42 adamdunkels Exp $ */ /** @@ -180,7 +180,13 @@ hdrsize(const struct packetbuf_attrlist *a) size += len; } return size / 8; +} +/*---------------------------------------------------------------------------*/ +static void +init(void) +{ + } /*---------------------------------------------------------------------------*/ CC_CONST_FUNCTION struct chameleon_module chameleon_raw = { input, output, - hdrsize, NULL }; + hdrsize, init };