diff options
| author | Petr Mrázek | 2012-01-04 01:45:11 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-01-04 01:45:11 +0100 |
| commit | 86464b99cca06f9e3cf7dd05c6441136c6ab442f (patch) | |
| tree | ba1f42f1c9c799f6f7470fa498b7637c02a0d401 /library/Process-linux.cpp | |
| parent | 5b528694b716cbd9ba156bd875c5a8e40e7e1759 (diff) | |
| download | dfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.gz dfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.bz2 dfhack-86464b99cca06f9e3cf7dd05c6441136c6ab442f.tar.xz | |
Remove DfVector, break MSVC builds until further notice.
Diffstat (limited to 'library/Process-linux.cpp')
| -rw-r--r-- | library/Process-linux.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/Process-linux.cpp b/library/Process-linux.cpp index ee64c274..d2c04e10 100644 --- a/library/Process-linux.cpp +++ b/library/Process-linux.cpp @@ -111,8 +111,8 @@ Process::~Process() string Process::doReadClassName (void * vptr) { //FIXME: BAD!!!!! - int typeinfo = Process::readDWord((uint32_t)vptr - 0x4); - int typestring = Process::readDWord(typeinfo + 0x4); + void * typeinfo = Process::readPtr(vptr - 0x4); + void * typestring = Process::readPtr(typeinfo + 0x4); string raw = readCString(typestring); size_t start = raw.find_first_of("abcdefghijklmnopqrstuvwxyz");// trim numbers size_t end = raw.length(); @@ -138,8 +138,8 @@ void Process::getMemRanges( vector<t_memrange> & ranges ) (char*)&permissions, &offset, &device1, &device2, &node, (char*)&temp.name); - temp.start = start; - temp.end = end; + temp.start = (void *) start; + temp.end = (void *) end; temp.read = permissions[0] == 'r'; temp.write = permissions[1] == 'w'; temp.execute = permissions[2] == 'x'; @@ -214,7 +214,7 @@ bool Process::setPermisions(const t_memrange & range,const t_memrange &trgrange) if(trgrange.read)protect|=PROT_READ; if(trgrange.write)protect|=PROT_WRITE; if(trgrange.execute)protect|=PROT_EXEC; - result=mprotect((void *)range.start, range.end-range.start,protect); + result=mprotect((void *)range.start, (size_t)range.end-(size_t)range.start,protect); return result==0; }
\ No newline at end of file |
