So in fact remove this define and use related includes unconditionally. --HG-- branch : trunk
*Note: this is not supported by TC --HG-- branch : trunk