Merge zizzer:/bk/newmem

into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 60aabc4b93ef9d742f7e07363bd51f24170b85b8
This commit is contained in:
Ali Saidi 2007-02-07 16:43:47 -05:00
commit fdaff2b108
2 changed files with 2 additions and 1 deletions

View file

@ -41,6 +41,7 @@
#include <cassert> #include <cassert>
#include <list> #include <list>
#include "base/compiler.hh"
#include "base/misc.hh" #include "base/misc.hh"
#include "mem/request.hh" #include "mem/request.hh"
#include "sim/host.hh" #include "sim/host.hh"

View file

@ -40,7 +40,7 @@ using namespace std;
int int
main() main()
{ {
char foo[9]; char foo[] = "foo";
cprintf("%s\n", foo); cprintf("%s\n", foo);
cprintf("%d\n", 'A'); cprintf("%d\n", 'A');