Fix various mismatched prototypes and other compilation problems.
Core (make cpc) builds again, but crashes on startup.
diff --git a/contiki-cpc/apps/configedit-dsc.h b/contiki-cpc/apps/configedit-dsc.h
index 368b45c..2abf3a1 100644
--- a/contiki-cpc/apps/configedit-dsc.h
+++ b/contiki-cpc/apps/configedit-dsc.h
@@ -37,6 +37,6 @@
#include "dsc.h"
-DSC_HEADER(configedit_dsc);
+DSC_HEADER(configedit_dsc)
#endif /* __CONFIGEDIT_DSC_H__ */
diff --git a/contiki-cpc/apps/directory-dsc.h b/contiki-cpc/apps/directory-dsc.h
index da154fe..14998de 100644
--- a/contiki-cpc/apps/directory-dsc.h
+++ b/contiki-cpc/apps/directory-dsc.h
@@ -37,6 +37,6 @@
#include "dsc.h"
-DSC_HEADER(directory_dsc);
+DSC_HEADER(directory_dsc)
#endif /* __DIRECTORY_DSC_H__ */
diff --git a/contiki-cpc/ctk/conio.h b/contiki-cpc/ctk/conio.h
index e8c3cdb..859e905 100644
--- a/contiki-cpc/ctk/conio.h
+++ b/contiki-cpc/ctk/conio.h
@@ -40,7 +40,7 @@
char cgetc (void);
-void revers ();
+void revers (char);
void textcolor (unsigned char color);
diff --git a/contiki/apps/processes-dsc.c b/contiki/apps/processes-dsc.c
index 7315828..e2c37df 100644
--- a/contiki/apps/processes-dsc.c
+++ b/contiki/apps/processes-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon processes_icon;
/*-----------------------------------------------------------------------------------*/
DSC(processes_dsc,
"Process information",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon processes_icon =
{CTK_ICON("Processes", processesicon_bitmap, processesicon_textmap)};
+#else
+extern struct ctk_icon processes_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/processes-dsc.h b/contiki/apps/processes-dsc.h
index a00c0d8..6c2565e 100644
--- a/contiki/apps/processes-dsc.h
+++ b/contiki/apps/processes-dsc.h
@@ -37,6 +37,6 @@
#include "dsc.h"
-DSC_HEADER(processes_dsc);
+DSC_HEADER(processes_dsc)
#endif /* __PROCESSES_DSC_H__ */
diff --git a/contiki/ctk/ctk.c b/contiki/ctk/ctk.c
index 2523d1e..b54e823 100644
--- a/contiki/ctk/ctk.c
+++ b/contiki/ctk/ctk.c
@@ -1231,8 +1231,8 @@
register char *cptr, *cptr2;
static unsigned char len, txpos, typos, tlen;
- if(t->input != NULL && t->input(c, t)) {
- return;
+ if(t->input != NULL && t->input(c, (void*)t)) {
+ return;
}
txpos = t->xpos;
diff --git a/contiki/lib/list.c b/contiki/lib/list.c
index 4d8b505..64811ab 100644
--- a/contiki/lib/list.c
+++ b/contiki/lib/list.c
@@ -105,7 +105,7 @@
* \param list The list to be initialized.
*/
void
-list_init(list_t list)
+list_init(void** list)
{
*list = NULL;
}
@@ -122,7 +122,7 @@
* \sa list_tail()
*/
void *
-list_head(list_t list)
+list_head(void** list)
{
return *list;
}
@@ -140,7 +140,7 @@
* \param src The source list.
*/
void
-list_copy(list_t dest, list_t src)
+list_copy(void** dest, void** src)
{
*dest = *src;
}
@@ -157,7 +157,7 @@
* \sa list_head()
*/
void *
-list_tail(list_t list)
+list_tail(void** list)
{
struct list *l;
@@ -182,7 +182,7 @@
*
*/
void
-list_add(list_t list, void *item)
+list_add(void** list, void *item)
{
struct list *l;
@@ -201,7 +201,7 @@
* Add an item to the start of the list.
*/
void
-list_push(list_t list, void *item)
+list_push(void** list, void *item)
{
/* struct list *l;*/
@@ -219,7 +219,7 @@
*
*/
void *
-list_chop(list_t list)
+list_chop(void** list)
{
struct list *l, *r;
@@ -250,7 +250,7 @@
*/
/*---------------------------------------------------------------------------*/
void *
-list_pop(list_t list)
+list_pop(void** list)
{
struct list *l;
@@ -272,7 +272,7 @@
*/
/*---------------------------------------------------------------------------*/
void
-list_remove(list_t list, void *item)
+list_remove(void** list, void *item)
{
struct list *l, *r;
@@ -307,7 +307,7 @@
*/
/*---------------------------------------------------------------------------*/
int
-list_length(list_t list)
+list_length(void** list)
{
struct list *l;
int n = 0;