Fix icon declarations.
They can't be both extern and static...
diff --git a/contiki/apps/about-dsc.c b/contiki/apps/about-dsc.c
index c47c921..83a208b 100644
--- a/contiki/apps/about-dsc.c
+++ b/contiki/apps/about-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon about_icon;
/*-----------------------------------------------------------------------------------*/
DSC(about_dsc,
"About Contiki",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon about_icon =
{CTK_ICON("About Contiki", abouticon_bitmap, abouticon_textmap)};
+#else
+extern struct ctk_icon about_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/calc-dsc.c b/contiki/apps/calc-dsc.c
index aedec22..7b8355c 100644
--- a/contiki/apps/calc-dsc.c
+++ b/contiki/apps/calc-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon calc_icon;
/*-----------------------------------------------------------------------------------*/
DSC(calc_dsc,
"Simple calculator",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon calc_icon =
{CTK_ICON("Calculator", calcicon_bitmap, calcicon_textmap)};
+#else
+extern struct ctk_icon calc_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/editor-dsc.c b/contiki/apps/editor-dsc.c
index 1865a85..59d5ba3 100644
--- a/contiki/apps/editor-dsc.c
+++ b/contiki/apps/editor-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon editor_icon;
/*-----------------------------------------------------------------------------------*/
DSC(editor_dsc,
"A simple text editor",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon editor_icon =
{CTK_ICON("Editor", editoricon_bitmap, editoricon_textmap)};
+#else
+extern struct ctk_icon editor_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/netconf-dsc.c b/contiki/apps/netconf-dsc.c
index b0eb087..33858e0 100644
--- a/contiki/apps/netconf-dsc.c
+++ b/contiki/apps/netconf-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon netconf_icon;
/*-----------------------------------------------------------------------------------*/
DSC(netconf_dsc,
"Network configuration",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon netconf_icon =
{CTK_ICON("Network setup", tcpipconficon_bitmap, tcpipconficon_textmap)};
+#else
+extern struct ctk_icon netconf_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/shell-dsc.c b/contiki/apps/shell-dsc.c
index 6996cb0..8268838 100644
--- a/contiki/apps/shell-dsc.c
+++ b/contiki/apps/shell-dsc.c
@@ -35,7 +35,6 @@
#include "dsc.h"
-extern struct ctk_icon shell_icon;
/*-----------------------------------------------------------------------------------*/
DSC(shell_dsc,
"The Contiki command shell",
@@ -70,5 +69,7 @@
#if CTK_CONF_ICONS
static struct ctk_icon shell_icon =
{CTK_ICON("Command shell", shellicon_bitmap, shellicon_textmap)};
+#else
+extern struct ctk_icon shell_icon;
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/