From 614fa668cd570960d65e64cbb6f1b0c7406a8eb0 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Fri, 8 Feb 2008 22:48:28 +0000
Subject: [PATCH] Removed SELFSTART_PROCESS as AUTOSTART_ENABLE generally
 serves that purpose - and AUTOSTART_ENABLE gets already set as required :-)

---
 apps/about/about.c                     | 4 +---
 apps/calc/calc.c                       | 4 +---
 apps/dhcp/dhcp.c                       | 2 --
 apps/directory/directory.c             | 4 +---
 apps/email/email.c                     | 4 +---
 apps/ftp/ftp.c                         | 4 +---
 apps/irc/irc.c                         | 4 +---
 apps/netconf/netconf.c                 | 4 +---
 apps/process-list/process-list.c       | 4 +---
 apps/program-handler/program-handler.c | 4 +---
 apps/shell/gui-shell.c                 | 4 +---
 apps/telnet/simpletelnet.c             | 4 +---
 apps/webbrowser/www.c                  | 4 +---
 apps/webserver/webserver-nogui.c       | 5 ++++-
 apps/webserver/webserver.c             | 4 +---
 platform/win32/Makefile.win32          | 4 ++--
 16 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/apps/about/about.c b/apps/about/about.c
index c7c30cb1b..1babdea50 100644
--- a/apps/about/about.c
+++ b/apps/about/about.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: about.c,v 1.3 2008/02/07 16:28:11 oliverschmidt Exp $
+ * $Id: about.c,v 1.4 2008/02/08 22:48:28 oliverschmidt Exp $
  *
  */
 
@@ -60,9 +60,7 @@ static struct ctk_button aboutclose =
 
 PROCESS(about_process, "About Contiki");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&about_process);
-#endif /* SELFSTART_PROCESS */
 
 /*-----------------------------------------------------------------------------------*/
 static void
diff --git a/apps/calc/calc.c b/apps/calc/calc.c
index c3861f6ba..f1fc27d6c 100644
--- a/apps/calc/calc.c
+++ b/apps/calc/calc.c
@@ -29,7 +29,7 @@
  *
  * This an example program for the Contiki desktop OS
  *
- * $Id: calc.c,v 1.4 2008/02/07 16:28:27 oliverschmidt Exp $
+ * $Id: calc.c,v 1.5 2008/02/08 22:48:47 oliverschmidt Exp $
  *
  */
 
@@ -82,9 +82,7 @@ static struct ctk_button calcbutton =
 
 PROCESS(calc_process, "Calculator");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&calc_process);
-#endif /* SELFSTART_PROCESS */
 
 static unsigned long operand1, operand2;
 static unsigned char op;
diff --git a/apps/dhcp/dhcp.c b/apps/dhcp/dhcp.c
index 9f756abd6..c492cf6df 100644
--- a/apps/dhcp/dhcp.c
+++ b/apps/dhcp/dhcp.c
@@ -6,9 +6,7 @@
 
 PROCESS(dhcp_process, "DHCP");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&dhcp_process);
-#endif /* SELFSTART_PROCESS */
 
 static struct ctk_window window;
 static struct ctk_button getbutton =
diff --git a/apps/directory/directory.c b/apps/directory/directory.c
index 67d3d6476..1c5443f6d 100644
--- a/apps/directory/directory.c
+++ b/apps/directory/directory.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: directory.c,v 1.5 2008/02/07 16:29:08 oliverschmidt Exp $
+ * $Id: directory.c,v 1.6 2008/02/08 22:49:29 oliverschmidt Exp $
  *
  */
 
@@ -76,9 +76,7 @@ static struct ctk_button reloadbutton =
 
 PROCESS(directory_process, "Directory browser");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&directory_process);
-#endif /* SELFSTART_PROCESS */
 
 static unsigned char width, height;
 
diff --git a/apps/email/email.c b/apps/email/email.c
index b8e7b74ac..e6efc3bc6 100644
--- a/apps/email/email.c
+++ b/apps/email/email.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: email.c,v 1.4 2008/02/07 16:29:24 oliverschmidt Exp $
+ * $Id: email.c,v 1.5 2008/02/08 22:49:54 oliverschmidt Exp $
  *
  */
 
@@ -157,9 +157,7 @@ static struct ctk_button setupokbutton =
 
 PROCESS(email_process, "E-mail client");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&email_process);
-#endif /* SELFSTART_PROCESS */
 
 /*-----------------------------------------------------------------------------------*/
 static void
diff --git a/apps/ftp/ftp.c b/apps/ftp/ftp.c
index 6a40fbef9..c4d245caf 100644
--- a/apps/ftp/ftp.c
+++ b/apps/ftp/ftp.c
@@ -30,7 +30,7 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: ftp.c,v 1.5 2008/02/07 16:30:08 oliverschmidt Exp $
+ * $Id: ftp.c,v 1.6 2008/02/08 22:50:23 oliverschmidt Exp $
  */
 /* Note to self: It would be nice to have a "View" option in the download dialog. */
 
@@ -52,9 +52,7 @@
 
 PROCESS(ftp_process, "FTP client");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&ftp_process);
-#endif /* SELFSTART_PROCESS */
 
 static void *connection;
 
diff --git a/apps/irc/irc.c b/apps/irc/irc.c
index b4af8904b..43b7f1c77 100644
--- a/apps/irc/irc.c
+++ b/apps/irc/irc.c
@@ -30,7 +30,7 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: irc.c,v 1.6 2008/02/07 16:30:24 oliverschmidt Exp $
+ * $Id: irc.c,v 1.7 2008/02/08 22:50:43 oliverschmidt Exp $
  */
 
 #include <string.h>
@@ -60,9 +60,7 @@
 
 PROCESS(irc_process, "IRC client");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&irc_process);
-#endif /* SELFSTART_PROCESS */
 
 static struct ctk_window window;
 static char log[LOG_WIDTH * LOG_HEIGHT];
diff --git a/apps/netconf/netconf.c b/apps/netconf/netconf.c
index e28dea951..a4e761b05 100644
--- a/apps/netconf/netconf.c
+++ b/apps/netconf/netconf.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: netconf.c,v 1.7 2008/02/07 16:30:42 oliverschmidt Exp $
+ * $Id: netconf.c,v 1.8 2008/02/08 22:51:01 oliverschmidt Exp $
  *
  */
 
@@ -67,9 +67,7 @@ static struct ctk_button tcpipclosebutton =
 
 PROCESS(netconf_process, "Network configurator");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&netconf_process);
-#endif /* SELFSTART_PROCESS */
 
 static void makestrings(void);
 
diff --git a/apps/process-list/process-list.c b/apps/process-list/process-list.c
index 097d69bd0..e09369f84 100644
--- a/apps/process-list/process-list.c
+++ b/apps/process-list/process-list.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: process-list.c,v 1.7 2008/02/07 16:30:58 oliverschmidt Exp $
+ * $Id: process-list.c,v 1.8 2008/02/08 22:51:27 oliverschmidt Exp $
  *
  */
 
@@ -65,9 +65,7 @@ static struct ctk_button processclosebutton =
 
 PROCESS(processes_process, "Process listing");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&processes_process);
-#endif /* SELFSTART_PROCESS */
 
 enum {
   EVENT_UPDATE
diff --git a/apps/program-handler/program-handler.c b/apps/program-handler/program-handler.c
index 229d0dec6..8448cb566 100644
--- a/apps/program-handler/program-handler.c
+++ b/apps/program-handler/program-handler.c
@@ -43,7 +43,7 @@
  *
  * This file is part of the Contiki desktop OS
  *
- * $Id: program-handler.c,v 1.8 2008/02/07 16:31:14 oliverschmidt Exp $
+ * $Id: program-handler.c,v 1.9 2008/02/08 22:51:57 oliverschmidt Exp $
  *
  */
 
@@ -124,9 +124,7 @@ static struct ctk_button errorokbutton =
 
 PROCESS(program_handler_process, "Program handler");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&program_handler_process);
-#endif /* SELFSTART_PROCESS */
 
 static const char * const errormsgs[] = {
   "Ok",
diff --git a/apps/shell/gui-shell.c b/apps/shell/gui-shell.c
index 73bf6f84d..99565976f 100644
--- a/apps/shell/gui-shell.c
+++ b/apps/shell/gui-shell.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: gui-shell.c,v 1.2 2008/02/08 12:49:54 oliverschmidt Exp $
+ * $Id: gui-shell.c,v 1.3 2008/02/08 22:52:18 oliverschmidt Exp $
  *
  */
 
@@ -64,9 +64,7 @@ static struct ctk_textentry commandentry =
 
 PROCESS(shell_gui_process, "Command shell");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&shell_gui_process);
-#endif /* SELFSTART_PROCESS */
 
 /*-----------------------------------------------------------------------------------*/
 void
diff --git a/apps/telnet/simpletelnet.c b/apps/telnet/simpletelnet.c
index 5a4efe131..9d0823626 100644
--- a/apps/telnet/simpletelnet.c
+++ b/apps/telnet/simpletelnet.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: simpletelnet.c,v 1.4 2008/02/07 16:31:34 oliverschmidt Exp $
+ * $Id: simpletelnet.c,v 1.5 2008/02/08 22:52:43 oliverschmidt Exp $
  *
  */
 
@@ -91,9 +91,7 @@ static char sendline[31+2];
 
 PROCESS(simpletelnet_process, "Telnet client");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&simpletelnet_process);
-#endif /* SELFSTART_PROCESS */
 
 /*-----------------------------------------------------------------------------------*/
 static void
diff --git a/apps/webbrowser/www.c b/apps/webbrowser/www.c
index 3fddb4930..4e9b6e170 100644
--- a/apps/webbrowser/www.c
+++ b/apps/webbrowser/www.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www.c,v 1.8 2008/02/07 16:31:51 oliverschmidt Exp $
+ * $Id: www.c,v 1.9 2008/02/08 22:53:11 oliverschmidt Exp $
  *
  */
 
@@ -164,9 +164,7 @@ static char receivingmsgs[4][23] = {
 
 PROCESS(www_process, "Web browser");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&www_process);
-#endif /* SELFSTART_PROCESS */
 
 static void formsubmit(struct formattribs *attribs);
 
diff --git a/apps/webserver/webserver-nogui.c b/apps/webserver/webserver-nogui.c
index d01599f29..94cfedd58 100644
--- a/apps/webserver/webserver-nogui.c
+++ b/apps/webserver/webserver-nogui.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki OS.
  *
- * $Id: webserver-nogui.c,v 1.4 2007/04/23 21:19:55 oliverschmidt Exp $
+ * $Id: webserver-nogui.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
  *
  */
 
@@ -44,6 +44,9 @@
 #include "httpd.h"
 
 PROCESS(webserver_nogui_process, "Web server");
+
+AUTOSTART_PROCESSES(&webserver_nogui_process);
+
 /*---------------------------------------------------------------------------*/
 PROCESS_THREAD(webserver_nogui_process, ev, data)
 {
diff --git a/apps/webserver/webserver.c b/apps/webserver/webserver.c
index 6e8d2ba8d..8e6b8e9aa 100644
--- a/apps/webserver/webserver.c
+++ b/apps/webserver/webserver.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: webserver.c,v 1.4 2008/02/07 16:32:11 oliverschmidt Exp $
+ * $Id: webserver.c,v 1.5 2008/02/08 22:53:32 oliverschmidt Exp $
  *
  */
 
@@ -51,9 +51,7 @@ static struct ctk_label message =
 
 PROCESS(webserver_process, "Web server");
 
-#if SELFSTART_PROCESS
 AUTOSTART_PROCESSES(&webserver_process);
-#endif /* SELFSTART_PROCESS */
 
 #define LOG_WIDTH  38
 #define LOG_HEIGHT 16
diff --git a/platform/win32/Makefile.win32 b/platform/win32/Makefile.win32
index d2b08b2d2..2ef1e5da4 100644
--- a/platform/win32/Makefile.win32
+++ b/platform/win32/Makefile.win32
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.win32,v 1.12 2008/02/07 16:34:18 oliverschmidt Exp $
+# $Id: Makefile.win32,v 1.13 2008/02/08 22:55:59 oliverschmidt Exp $
 #
 
 ifndef CONTIKI
@@ -75,7 +75,7 @@ ${foreach DSC,$(DSCS),${eval ${call dsc_template,$(DSC),${call appname,$(DSC)}}}
 ### (The *.d files contain the full module-compile prerequisites)
 ${sort ${foreach PRG,$(PRGS), ${addprefix $(OBJECTDIR)/, \
                                 $(${call appname,$(PRG)_src:.c=.o})}}}:
-	$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -DSELFSTART_PROCESS -D_USRDLL -c $< -o $@
+	$(CC) $(CFLAGS) -DAUTOSTART_ENABLE -D_USRDLL -c $< -o $@
 $(PRGS:=.prg):
 	$(LD) -shared $^ contiki-main.$(TARGET).a -o $@
 $(DSCS:=.dsc):