Paulo Moura's changes for conditional compilation.
Authored by: tswift 2012-09-07
Parent: [r7617]
Child: [r7619]