From 62fa3b8c013d98d34404ab3bf46a8083781b33bf Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Tue, 15 Aug 2006 14:46:33 +0000 Subject: [PATCH] Changed the Contiki Interface declaration macros from CCI/CLI to CCIF/CLIF because of already existing macros: Both CCI and CLI :-( --- platform/c64/contiki-conf.h | 4 ++-- platform/esb/contiki-conf.h | 4 ++-- platform/ethernut1/contiki-conf.h | 4 ++-- platform/ethernut2/contiki-conf.h | 4 ++-- platform/gtk/contiki-conf.h | 4 ++-- platform/minimal-net/contiki-conf.h | 6 +++--- platform/minimal-ppp/contiki-conf.h | 6 +++--- platform/native/contiki-conf.h | 6 +++--- platform/netsim/contiki-conf.h | 6 +++--- platform/sky/contiki-conf.h | 6 +++--- platform/win32/contiki-conf.h | 8 ++++---- platform/win32/loader/dll-loader.h | 10 +++++----- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/platform/c64/contiki-conf.h b/platform/c64/contiki-conf.h index 29293ffe0..01443bdc9 100644 --- a/platform/c64/contiki-conf.h +++ b/platform/c64/contiki-conf.h @@ -269,8 +269,8 @@ /* Interface configuration. */ -#define CCI -#define CLI +#define CCIF +#define CLIF /* Clock configuration. */ diff --git a/platform/esb/contiki-conf.h b/platform/esb/contiki-conf.h index e5737c090..c6bc2e860 100644 --- a/platform/esb/contiki-conf.h +++ b/platform/esb/contiki-conf.h @@ -22,8 +22,8 @@ #define CC_CONF_VA_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF typedef unsigned short clock_time_t; #define CLOCK_CONF_SECOND 8 diff --git a/platform/ethernut1/contiki-conf.h b/platform/ethernut1/contiki-conf.h index d174a8db3..0217a2b9e 100644 --- a/platform/ethernut1/contiki-conf.h +++ b/platform/ethernut1/contiki-conf.h @@ -4,8 +4,8 @@ #define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF typedef unsigned short clock_time_t; #define CLOCK_CONF_SECOND 1000 diff --git a/platform/ethernut2/contiki-conf.h b/platform/ethernut2/contiki-conf.h index 62b9f7d45..75811e1d1 100644 --- a/platform/ethernut2/contiki-conf.h +++ b/platform/ethernut2/contiki-conf.h @@ -4,8 +4,8 @@ #define CC_CONF_REGISTER_ARGS 1 #define CC_CONF_FUNCTION_POINTER_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF typedef unsigned short clock_time_t; #define CLOCK_CONF_SECOND 1000 diff --git a/platform/gtk/contiki-conf.h b/platform/gtk/contiki-conf.h index 52430f557..b4a6e5f9f 100644 --- a/platform/gtk/contiki-conf.h +++ b/platform/gtk/contiki-conf.h @@ -7,8 +7,8 @@ -#define CCI -#define CLI +#define CCIF +#define CLIF diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index 3114ae1d6..095eb17d5 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:11:45 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:00 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -41,8 +41,8 @@ #define CC_CONF_FASTCALL #define CC_CONF_VA_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF typedef uint8_t u8_t; typedef uint16_t u16_t; diff --git a/platform/minimal-ppp/contiki-conf.h b/platform/minimal-ppp/contiki-conf.h index 6929170d2..5976f05d0 100644 --- a/platform/minimal-ppp/contiki-conf.h +++ b/platform/minimal-ppp/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:12:37 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:18 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -45,8 +45,8 @@ #define CC_CONF_FASTCALL #define CC_CONF_VA_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF typedef uint8_t u8_t; typedef uint16_t u16_t; diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index d4f11f02c..d3d7ef7bc 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: contiki-conf.h,v 1.2 2006/08/13 15:13:21 oliverschmidt Exp $ + * @(#)$Id: contiki-conf.h,v 1.3 2006/08/15 14:48:33 oliverschmidt Exp $ */ #ifndef __CONTIKI_CONF_H__ @@ -42,8 +42,8 @@ #define CC_CONF_VA_ARGS 1 #define CC_CONF_INLINE inline -#define CCI -#define CLI +#define CCIF +#define CLIF typedef uint8_t u8_t; typedef uint16_t u16_t; diff --git a/platform/netsim/contiki-conf.h b/platform/netsim/contiki-conf.h index f0a0e846a..8af52bb28 100644 --- a/platform/netsim/contiki-conf.h +++ b/platform/netsim/contiki-conf.h @@ -32,7 +32,7 @@ * * This file is part of the Contiki desktop OS * - * $Id: contiki-conf.h,v 1.2 2006/08/13 15:13:53 oliverschmidt Exp $ + * $Id: contiki-conf.h,v 1.3 2006/08/15 14:48:47 oliverschmidt Exp $ * */ @@ -42,8 +42,8 @@ #define CC_CONF_VA_ARGS 1 -#define CCI -#define CLI +#define CCIF +#define CLIF /*------------------------------------------------------------------------------*/ /** diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h index 2af4adb99..2204060f8 100644 --- a/platform/sky/contiki-conf.h +++ b/platform/sky/contiki-conf.h @@ -1,11 +1,11 @@ /* -*- C -*- */ -/* @(#)$Id: contiki-conf.h,v 1.3 2006/08/13 15:15:48 oliverschmidt Exp $ */ +/* @(#)$Id: contiki-conf.h,v 1.4 2006/08/15 14:49:32 oliverschmidt Exp $ */ #ifndef CONTIKI_CONF_H #define CONTIKI_CONF_H -#define CCI -#define CLI +#define CCIF +#define CLIF /* This is still experimental. /bg */ #define UAODV_BAD_ROUTE diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h index 1ca6ac984..2cae9c7ee 100644 --- a/platform/win32/contiki-conf.h +++ b/platform/win32/contiki-conf.h @@ -7,11 +7,11 @@ #if _USRDLL -#define CCI __declspec(dllimport) -#define CLI __declspec(dllexport) +#define CCIF __declspec(dllimport) +#define CLIF __declspec(dllexport) #else -#define CCI __declspec(dllexport) -#define CLI +#define CCIF __declspec(dllexport) +#define CLIF #endif diff --git a/platform/win32/loader/dll-loader.h b/platform/win32/loader/dll-loader.h index 8ceabf9d7..8682019a3 100644 --- a/platform/win32/loader/dll-loader.h +++ b/platform/win32/loader/dll-loader.h @@ -30,7 +30,7 @@ * * Author: Oliver Schmidt * - * $Id: dll-loader.h,v 1.2 2006/08/14 23:46:43 oliverschmidt Exp $ + * $Id: dll-loader.h,v 1.3 2006/08/15 14:50:13 oliverschmidt Exp $ */ #ifndef __DLL_LOADER_H__ #define __DLL_LOADER_H__ @@ -40,9 +40,9 @@ #define LOADER_LOAD_DSC(name) dll_loader_load_dsc(name) #define LOADER_UNLOAD_DSC(dsc) dll_loader_unload_dsc(dsc) -CCI int dll_loader_load(char *name, char *arg); -CCI void dll_loader_unload(void *addr); -CCI struct dsc *dll_loader_load_dsc(char *name); -CCI void __stdcall dll_loader_unload_dsc(void *addr); +CCIF int dll_loader_load(char *name, char *arg); +CCIF void dll_loader_unload(void *addr); +CCIF struct dsc *dll_loader_load_dsc(char *name); +CCIF void __stdcall dll_loader_unload_dsc(void *addr); #endif /* __DLL_LOADER_H__ */