FF 3.6x equate conflicts

[Mark Strickland]

I am working on moving some code that uses Cheetah to 3.6x FF.  It seems that there are lots of old Cheetah equates that are in conflict with some in various other includes (some Jose's) and PB10.  I am sure there are more that the Cheetah issues.

What would be the best way to fix this problem?

Thanks.

Mark Strickland

[Paul Squires]

Modify the Cheetah Include file to preface the includes with CHEETAH_ or something similar. Just make sure you don't change the numeric values of the equates.