Prevent name conflict with X11 None definition.
Note that with the release of 1.8.0, googlemock and googletest are unified into a single release.