[Lldb-commits] [lldb] r128347 - in /lldb/trunk: include/lldb/Core/ include/lldb/Symbol/ source/API/ source/Commands/ source/Core/ source/Expression/ source/Plugins/Disassembler/llvm/ source/Symbol/ source/Target/ test/settings/

[Greg Clayton]

No, please put it back. I was using a local diff / merge tool and picked the wrong one. Sorry about that, it was a large merge with a bunch of diffs.


On Mar 26, 2011, at 8:47 PM, Stephen Wilson wrote:

> Hi Greg,
> 
> On Sat, Mar 26, 2011 at 07:14:58PM -0000, Greg Clayton wrote:
>> ==============================================================================
>> --- lldb/trunk/include/lldb/Core/Opcode.h (original)
>> +++ lldb/trunk/include/lldb/Core/Opcode.h Sat Mar 26 14:14:58 2011
>> @@ -11,8 +11,6 @@
>> #define lldb_Opcode_h
>> 
>> // C Includes
>> -#include <string.h>
>> -
> 
> Any particular reason for this (I added the include recently in
> r128311)?  We need it for the declaration of memcpy on linux.
> 
> 
>> // C++ Includes
>> // Other libraries and framework includes
>> // Project includes
>> @@ -163,6 +161,7 @@
>>             if (bytes && length > 0)
>>             {
>>                 m_type = eTypeBytes;
>> +                m_data.inst.length = length;
>>                 assert (length < sizeof (m_data.inst.bytes));
>>                 memcpy (m_data.inst.bytes, bytes, length);
>>             }
>> 
>