http://cr.openjdk.java.net/~aeubanks/tsandeflauncher/webrev.00/index.html Rename INCLUDE_TSAN to LAUNCHER_INCLUDE_TSAN in launcher It's confusing that it's the same name as the hotspot macro but uses a different style (#ifdef vs #if).