Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tossim / tossim.c

diff --git a/tos/lib/tossim/tossim.c b/tos/lib/tossim/tossim.c
index 5011855f0414fb97b30ce1d6d8a6072ba92a0ca9..74283ccfe6c923ce03992b9e3f7a050eb03ff0a8 100644 (file)
--- a/tos/lib/tossim/tossim.c
+++ b/tos/lib/tossim/tossim.c
@@ -113,8 +113,8 @@ variable_string_t Variable::getData() {
     memcpy(data, ptr, len);
   }
   else {
-    str.ptr = "<no such variable>";
-    str.type = "<no such variable>";
+    str.ptr = (char*)"<no such variable>";
+    str.type = (char*)"<no such variable>";
     str.len = strlen("<no such variable>");
     str.isArray = 0;
   }
@@ -166,7 +166,7 @@ void Mote::setID(unsigned long val) {
 }
 
 Variable* Mote::getVariable(char* name) {
-  char* typeStr = "";
+  char* typeStr = (char*)"";
   int isArray;
   Variable* var;