summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-11-28 13:53:03 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-11-28 13:53:03 +0000
commita1913c5f84a536c2c5e35bd326605525b6d39e75 (patch)
tree3fd338f9e40cc6174ee33e74d3ce998d57c7dc46
parent5e7a0c61f582f7ecd77c2e69616909ecdec332c2 (diff)
2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* init.c, system.h: Update from CVS head to be buildable.
-rw-r--r--http/ChangeLog4
-rw-r--r--http/init.c4
-rw-r--r--http/system.h8
-rw-r--r--netlink/ChangeLog4
-rw-r--r--netlink/init.c4
-rw-r--r--netlink/system.h2
6 files changed, 15 insertions, 11 deletions
diff --git a/http/ChangeLog b/http/ChangeLog
index f7e09f2..bde3fd0 100644
--- a/http/ChangeLog
+++ b/http/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * init.c, system.h: Update from CVS head to be buildable.
+
2007-04-13 Joel Sherrill <joel@OARcorp.com>
* system.h: Correct URLs.
diff --git a/http/init.c b/http/init.c
index 9ade8c4..864a0a9 100644
--- a/http/init.c
+++ b/http/init.c
@@ -35,10 +35,10 @@
#include <errno.h>
#include <time.h>
-#include <confdefs.h>
+#include <rtems/confdefs.h>
#include <stdio.h>
#include <rtems/rtems_bsdnet.h>
-#include <ftpd.h>
+#include <rtems/ftpd.h>
#include <rtems/error.h>
diff --git a/http/system.h b/http/system.h
index b79a939..ed2eab6 100644
--- a/http/system.h
+++ b/http/system.h
@@ -13,7 +13,7 @@
* $Id$
*/
-#include <tmacros.h>
+#include <rtems.h>
/* functions */
@@ -23,10 +23,6 @@ rtems_task Init(
/* configuration information */
-#include <confdefs.h>
-
-/* global variables */
-
-TEST_EXTERN rtems_id Global_variable; /* example global variable */
+#include <rtems/confdefs.h>
/* end of include file */
diff --git a/netlink/ChangeLog b/netlink/ChangeLog
index acfbebd..cbcaadd 100644
--- a/netlink/ChangeLog
+++ b/netlink/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * init.c, system.h: Update from CVS head to be buildable.
+
2007-04-13 Joel Sherrill <joel@OARcorp.com>
* system.h: Correct URLs.
diff --git a/netlink/init.c b/netlink/init.c
index 6847c4e..734a106 100644
--- a/netlink/init.c
+++ b/netlink/init.c
@@ -32,7 +32,7 @@ rtems_task Init(
/* configuration information */
-#include <confdefs.h>
+#include <rtems/confdefs.h>
#include <errno.h>
#include <time.h>
@@ -40,7 +40,7 @@ rtems_task Init(
#include <confdefs.h>
#include <stdio.h>
#include <rtems/rtems_bsdnet.h>
-#include <ftpd.h>
+#include <rtems/ftpd.h>
#include <rtems/error.h>
diff --git a/netlink/system.h b/netlink/system.h
index b79a939..fe45448 100644
--- a/netlink/system.h
+++ b/netlink/system.h
@@ -23,7 +23,7 @@ rtems_task Init(
/* configuration information */
-#include <confdefs.h>
+#include <rtems/confdefs.h>
/* global variables */