[llvm-commits] [llvm] r51775 - in /llvm/trunk: Makefile.rules include/llvm/Analysis/AliasAnalysis.h include/llvm/Analysis/AliasSetTracker.h include/llvm/Analysis/CallGraph.h include/llvm/Analysis/LibCallSemantics.h include/llvm/Assembly/PrintModulePass.h include/llvm/CodeGen/MachineRelocation.h include/llvm/Support/CallSite.h include/llvm/Target/TargetMachineRegistry.h include/llvm/Transforms/IPO/InlinerPass.h include/llvm/Transforms/Utils/Cloning.h include/llvm/Transforms/Utils/InlineCost.h utils/GenLibDeps.pl

[Nathan Keynes]

On 31/05/2008, at 6:21 AM, Chris Lattner wrote:

>
> On May 30, 2008, at 1:01 PM, Evan Cheng wrote:
>
>> Yeah, it's probably better to add a '_' after the names to avoid name
>> clashing. If this bothers you, I can undo the patch.
>>
>> Nathan, can you try a different approach?
>
> I think this should be reverted for now.  Nathan, is it possible to  
> just sprinkle "#undef CS" etc in a few headers?


Hi Chris,

    I don't really recommend changing system definitions in publicly  
exported header files[0] (which these are of course), but if you'd  
prefer to do it this way, patches are below (To be combined with 1+3  
from the previous series). In the alternative I'm happy to rename them  
to something else (whatever the preference here is, CS_ ?  
SomeRelevantPrefixCS?)

Regards,
Nathan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm-gcc-4.2-solaris-undef.patch
Type: application/octet-stream
Size: 395 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20080602/799fcc58/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm-solaris-2-undef.patch
Type: application/octet-stream
Size: 4204 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20080602/799fcc58/attachment-0001.obj>
-------------- next part --------------


[0] I admit, however, that it may be unlikely that anyone will ever  
wish to use both LLVM and the ABI definitions at the same time.