[cadcdev-svn-commits] SF.net SVN: cadcdev:[760] kos/examples/dreamcast

[<ljs...@us...>]

Revision: 760
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=760&view=rev
Author:   ljsebald
Date:     2012-04-09 17:49:30 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Fix compilation of two examples that didn't compile before.

Modified Paths:
--------------
    kos/examples/dreamcast/conio/adventure/hdr.h
    kos/examples/dreamcast/conio/adventure/init.c
    kos/examples/dreamcast/conio/adventure/main.c
    kos/examples/dreamcast/network/httpd/httpd.c
    kos/examples/dreamcast/network/httpd/simhost.c

Modified: kos/examples/dreamcast/conio/adventure/hdr.h
===================================================================
--- kos/examples/dreamcast/conio/adventure/hdr.h	2012-04-09 12:08:51 UTC (rev 759)
+++ kos/examples/dreamcast/conio/adventure/hdr.h	2012-04-09 17:49:30 UTC (rev 760)
@@ -185,7 +185,7 @@
 int forced (int locc);
 void getin (char **wrd1, char **wrd2);
 int here (int objj);
-void init (void);
+void my_init (void);
 void juggle (int);
 int liq (void);
 int liqloc (int locc);

Modified: kos/examples/dreamcast/conio/adventure/init.c
===================================================================
--- kos/examples/dreamcast/conio/adventure/init.c	2012-04-09 12:08:51 UTC (rev 759)
+++ kos/examples/dreamcast/conio/adventure/init.c	2012-04-09 17:49:30 UTC (rev 760)
@@ -60,7 +60,7 @@
 static void linkdata (void);
 
 void
-init()                                  /* everything for 1st time run  */
+my_init()                               /* everything for 1st time run  */
 {
 	rdata();                        /* read data from orig. file    */
 	linkdata();

Modified: kos/examples/dreamcast/conio/adventure/main.c
===================================================================
--- kos/examples/dreamcast/conio/adventure/main.c	2012-04-09 12:08:51 UTC (rev 759)
+++ kos/examples/dreamcast/conio/adventure/main.c	2012-04-09 17:49:30 UTC (rev 760)
@@ -80,7 +80,7 @@
 	setgid(getgid());
 #endif
 
-	init();         /* Initialize everything */
+	my_init();      /* Initialize everything */
 	/* signal(SIGINT,trapdel); */
 
 #if 0

Modified: kos/examples/dreamcast/network/httpd/httpd.c
===================================================================
--- kos/examples/dreamcast/network/httpd/httpd.c	2012-04-09 12:08:51 UTC (rev 759)
+++ kos/examples/dreamcast/network/httpd/httpd.c	2012-04-09 17:49:30 UTC (rev 760)
@@ -4,9 +4,9 @@
    Copyright (C)2003 Dan Potter
 */
 
-#include <kos.h>
 #include <lwip/lwip.h>
 #include <lwip/sockets.h>
+#include <stdio.h>
 #include <sys/queue.h>
 
 struct http_state;

Modified: kos/examples/dreamcast/network/httpd/simhost.c
===================================================================
--- kos/examples/dreamcast/network/httpd/simhost.c	2012-04-09 12:08:51 UTC (rev 759)
+++ kos/examples/dreamcast/network/httpd/simhost.c	2012-04-09 17:49:30 UTC (rev 760)
@@ -1,9 +1,14 @@
-#include <kos.h>
 #include <lwip/lwip.h>
-#include <unistd.h>
 
+#include <kos/thread.h>
+#include <dc/video.h>
+#include <dc/biosfont.h>
+#include <dc/maple.h>
+#include <dc/maple/controller.h>
+
 extern uint8 romdisk[];
 KOS_INIT_ROMDISK(romdisk);
+KOS_INIT_FLAGS(INIT_DEFAULT | INIT_NET);
 
 void httpd();
 void *do_httpd(void * foo) {
@@ -12,7 +17,6 @@
 }
 
 int main(int argc, char **argv) {
-	net_init();
 	lwip_kos_init();
 	thd_create(1, do_httpd, NULL);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.