]> Joshua Wise's Git repositories - netwatch.git/commitdiff
git.joshuawise.com / netwatch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b34003c)
some changes for gcc4
authorJacob Potter <jdpotter@andrew.cmu.edu>
Sun, 14 Dec 2008 05:54:52 +0000 (00:54 -0500)
committerJacob Potter <jdpotter@andrew.cmu.edu>
Sun, 14 Dec 2008 05:54:52 +0000 (00:54 -0500)
lwip/src/include/arch/cc.h patch | blob | blame | history
net/http/fs.c patch | blob | blame | history
net/http/fs.h patch | blob | blame | history
net/http/fsdata.c patch | blob | blame | history
net/http/fsdata.h patch | blob | blame | history
net/http/httpd.c patch | blob | blame | history

diff --git a/lwip/src/include/arch/cc.h b/lwip/src/include/arch/cc.h
index 7878080fb64577bc2b6eabb743984c88f843d869..62df7c4de4c24d266ebcf1178e7b6f07118a125e 100644 (file)
--- a/lwip/src/include/arch/cc.h
+++ b/lwip/src/include/arch/cc.h
@@ -14,7 +14,7 @@ typedef int16_t s16_t;
 typedef int32_t s32_t;
 typedef uint32_t mem_ptr_t;
 
 typedef int32_t s32_t;
 typedef uint32_t mem_ptr_t;
 
-#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
+#define PACK_STRUCT_FIELD(x) x
 #define PACK_STRUCT_STRUCT __attribute__((packed))
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END
 #define PACK_STRUCT_STRUCT __attribute__((packed))
 #define PACK_STRUCT_BEGIN
 #define PACK_STRUCT_END
diff --git a/net/http/fs.c b/net/http/fs.c
index cb7a2263c7bf5980fd3b7db059fa3ed67922ef1b..0bf11cb9c97a2440a8e2a5ad85e357a3fa266774 100644 (file)
--- a/net/http/fs.c
+++ b/net/http/fs.c
@@ -42,7 +42,7 @@
 
 void handle_regs(struct fs_file *file)
 {
 
 void handle_regs(struct fs_file *file)
 {
-  static unsigned char buf[2048];
+  static char buf[2048];
   
   sprintf(buf,
     "<html><head><title>Registers</title></head><body>"
   
   sprintf(buf,
     "<html><head><title>Registers</title></head><body>"
@@ -72,8 +72,8 @@ void handle_regs(struct fs_file *file)
 
 void handle_backtrace(struct fs_file *file)
 {
 
 void handle_backtrace(struct fs_file *file)
 {
-  static unsigned char buf[2048];
-  static unsigned char buf2[64];
+  static char buf[2048];
+  static char buf2[64];
   int i = 10;
   unsigned long *pebp, *peip;
   unsigned long ebp;
   int i = 10;
   unsigned long *pebp, *peip;
   unsigned long ebp;
diff --git a/net/http/fs.h b/net/http/fs.h
index 1f7d434723e439c2b86e1bc2e232735b3b5a8f2d..fd7e6e2f42870fff15e0b548692251cf6c1081e1 100644 (file)
--- a/net/http/fs.h
+++ b/net/http/fs.h
@@ -33,7 +33,7 @@
 #define __FS_H__
 
 struct fs_file {
 #define __FS_H__
 
 struct fs_file {
-  const unsigned char *data;
+  const char *data;
   int len;
 };
 
   int len;
 };
 
diff --git a/net/http/fsdata.c b/net/http/fsdata.c
index 70337a8c354590218c5ff25f30a476df70ee3e68..066f058b2582c73cf7b63cf1abb6253589f9a238 100644 (file)
--- a/net/http/fsdata.c
+++ b/net/http/fsdata.c
@@ -1,9 +1,9 @@
-static const unsigned char data_404_html[] =
+static const char data_404_html[] =
   "<html><head><title>404 Not Found</title></head>"
   "<body><h1>404 Not Found</h1><p>This is probably not the machine you're looking for...</p></body>"
   "</html>";
 
   "<html><head><title>404 Not Found</title></head>"
   "<body><h1>404 Not Found</h1><p>This is probably not the machine you're looking for...</p></body>"
   "</html>";
 
-static const unsigned char data_index_html[] =
+static const char data_index_html[] =
   "<html><head><title>NetWatch</title></head>"
   "<body><h1>NetWatch</h1>"
   "<iframe src=\"registers.html\" height=100 width=600></iframe><br>"
   "<html><head><title>NetWatch</title></head>"
   "<body><h1>NetWatch</h1>"
   "<iframe src=\"registers.html\" height=100 width=600></iframe><br>"
diff --git a/net/http/fsdata.h b/net/http/fsdata.h
index a6c5262fcb7c499abcb32e422a4301d2052d42a2..f4f39749b55068cd004d598b3a8e1cfeddf8ebac 100644 (file)
--- a/net/http/fsdata.h
+++ b/net/http/fsdata.h
@@ -34,8 +34,8 @@
 
 struct fsdata_file {
   const struct fsdata_file *next;
 
 struct fsdata_file {
   const struct fsdata_file *next;
-  const unsigned char *name;
-  const unsigned char *data;
+  const char *name;
+  const char *data;
   const int len;
 };
 
   const int len;
 };
 
diff --git a/net/http/httpd.c b/net/http/httpd.c
index 3ecea9325566e774f888f1e8cd67b77415a919f0..ed08b0ccbce75081e69e131d6a519fdc6162f84e 100644 (file)
--- a/net/http/httpd.c
+++ b/net/http/httpd.c
@@ -44,7 +44,7 @@
 
 struct http_state {
   u32_t left;
 
 struct http_state {
   u32_t left;
-  const unsigned char *file;
+  const char *file;
   u8_t retries;
 };
 
   u8_t retries;
 };
 
NetWatch system management mode lights out box
This page took 0.037244 seconds and 4 git commands to generate.