Removed includes for stuff that has been moved to the backyard. Added <stdint.h> include
This commit is contained in:
parent
477d39ce5b
commit
a1f11ff8e7
|
@ -2,7 +2,7 @@ ifndef CONTIKI
|
||||||
$(error CONTIKI not defined! You must specify where CONTIKI resides!)
|
$(error CONTIKI not defined! You must specify where CONTIKI resides!)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
APPS+=process-list webserver program-handler editor irc calc webbrowser email \
|
APPS+=process-list webserver program-handler irc calc webbrowser email \
|
||||||
shell netconf dhcp ftp
|
shell netconf dhcp ftp
|
||||||
|
|
||||||
CONTIKI_TARGET_DIRS = . ctk net
|
CONTIKI_TARGET_DIRS = . ctk net
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
typedef unsigned long clock_time_t;
|
typedef unsigned long clock_time_t;
|
||||||
#define CLOCK_CONF_SECOND 1000
|
#define CLOCK_CONF_SECOND 1000
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "ctk/ctk-arch.h"
|
#include "ctk/ctk-arch.h"
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki desktop environment
|
* This file is part of the Contiki desktop environment
|
||||||
*
|
*
|
||||||
* $Id: contiki-main.c,v 1.7 2007/05/23 22:03:41 oliverschmidt Exp $
|
* $Id: contiki-main.c,v 1.8 2007/11/19 12:23:02 adamdunkels Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -43,7 +43,6 @@
|
||||||
#include "ctk/ctk.h"
|
#include "ctk/ctk.h"
|
||||||
|
|
||||||
#include "ctk/ctk-vncserver.h"
|
#include "ctk/ctk-vncserver.h"
|
||||||
#include "ctk/ctk-termtelnet.h"
|
|
||||||
|
|
||||||
#include "net/tapdev-drv.h"
|
#include "net/tapdev-drv.h"
|
||||||
#include "program-handler.h"
|
#include "program-handler.h"
|
||||||
|
@ -53,7 +52,6 @@
|
||||||
#include "about-dsc.h"
|
#include "about-dsc.h"
|
||||||
#include "calc-dsc.h"
|
#include "calc-dsc.h"
|
||||||
#include "dhcp-dsc.h"
|
#include "dhcp-dsc.h"
|
||||||
#include "editor-dsc.h"
|
|
||||||
#include "email-dsc.h"
|
#include "email-dsc.h"
|
||||||
#include "ftp-dsc.h"
|
#include "ftp-dsc.h"
|
||||||
#include "irc-dsc.h"
|
#include "irc-dsc.h"
|
||||||
|
@ -89,7 +87,6 @@ PROCESS_THREAD(init_process, ev, data)
|
||||||
|
|
||||||
program_handler_add(&netconf_dsc, "Network setup", 1);
|
program_handler_add(&netconf_dsc, "Network setup", 1);
|
||||||
program_handler_add(&ftp_dsc, "FTP client", 1);
|
program_handler_add(&ftp_dsc, "FTP client", 1);
|
||||||
program_handler_add(&editor_dsc, "Editor", 1);
|
|
||||||
program_handler_add(&www_dsc, "Web browser", 1);
|
program_handler_add(&www_dsc, "Web browser", 1);
|
||||||
program_handler_add(&processes_dsc, "Processes", 1);
|
program_handler_add(&processes_dsc, "Processes", 1);
|
||||||
program_handler_add(&shell_dsc, "Command shell", 1);
|
program_handler_add(&shell_dsc, "Command shell", 1);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
#include "ctk/ctk-draw-service.h"
|
/*#include "ctk/ctk-draw-service.h"*/
|
||||||
|
|
||||||
#include "ctk-gtksim-draw.h"
|
#include "ctk-gtksim-draw.h"
|
||||||
#include "ctk-gtksim.h"
|
#include "ctk-gtksim.h"
|
||||||
|
|
Loading…
Reference in a new issue