Added workarounds for SDCC problems - bugs with unsigned chars and the arguments to function pointers
diff --git a/contiki/ctk/ctk.h b/contiki/ctk/ctk.h
index da04b47..2df2fd7 100644
--- a/contiki/ctk/ctk.h
+++ b/contiki/ctk/ctk.h
@@ -32,7 +32,7 @@
*
* This file is part of the "ctk" console GUI toolkit for cc65
*
- * $Id: ctk.h,v 1.4 2003/04/09 00:30:46 adamdunkels Exp $
+ * $Id: ctk.h,v 1.5 2003/04/09 13:45:08 adamdunkels Exp $
*
*/
@@ -42,6 +42,8 @@
#include "ctk-conf.h"
#include "ek.h"
+#include "cc.h"
+
/* Defintions for the CTK widget types. */
#define CTK_WIDGET_SEPARATOR 1
#define CTK_WIDGET_LABEL 2
@@ -238,8 +240,13 @@
struct ctk_menu *next;
char *title;
unsigned char titlelen;
+#if CC_UNSIGNED_CHAR_BUGS
unsigned char nitems;
unsigned char active;
+#else /* CC_UNSIGNED_CHAR_BUGS */
+ unsigned char nitems;
+ unsigned char active;
+#endif /* CC_UNSIGNED_CHAR_BUGS */
struct ctk_menuitem items[CTK_CONF_MAXMENUITEMS];
};