This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
compilation fix for redboot
- From: Jani Monoses <jani at iv dot ro>
- To: ecos-patches at sources dot redhat dot com
- Date: Mon, 14 Apr 2003 17:46:39 +0300
- Subject: compilation fix for redboot
Again for the case when TFTP is off :)
Just an #else if which the preprocessor does not understand turned to
#elif
Index: redboot/current//ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.104
diff -u -r1.104 ChangeLog
--- redboot/current//ChangeLog 8 Apr 2003 05:09:05 -0000 1.104
+++ redboot/current//ChangeLog 14 Apr 2003 14:35:13 -0000
@@ -1,3 +1,7 @@
+2003-04-14 Jani Monoses <jani at iv dot ro>
+ * src/load.c:
+ Change #else if to #elif so it compiles when TFTP is disabled.
+
2003-04-08 Jonathan Larmour <jifl at eCosCentric dot com>
* src/main.c (do_go): Silence unused variable warning when no
net. Index: redboot/current//src/load.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/load.c,v
retrieving revision 1.32
diff -u -r1.32 load.c
--- redboot/current//src/load.c 3 Apr 2003 15:27:24 -0000 1.32
+++ redboot/current//src/load.c 14 Apr 2003 14:35:32 -0000
@@ -689,7 +689,7 @@
#ifdef CYGSEM_REDBOOT_NET_TFTP_DOWNLOAD
which = "TFTP";
io = &tftp_io;
-#else if defined(CYGSEM_REDBOOT_NET_HTTP_DOWNLOAD)
+#elif defined(CYGSEM_REDBOOT_NET_HTTP_DOWNLOAD)
which = "HTTP";
io = &http_io;
#endif