Updates conditional directives to be consistent with the rest of the project.
Updates conditional directives to be consistent with the rest of the project.

git-svn-id: f2be60d55979b34ac5db539df6b28881faa6b372@381 8415998a-534a-0410-bf83-d39667b30386

bref/googlemock,svn2github/chromium-gmock,mydrive/gmock,openpeer/gmock,svn2github/googlemock,yquant/gmock,martindam/googlemock,martinhansdk/googlemock,sensorflo/gmock,guywithnose/android-googlemock,cryporchild/googlemock,cpp-mirrors/gmock,martinhansdk/googlemock,plexinc/googlemock,bpsinc-native/src_testing_gmock,e2/googlemock,bref/googlemock,codingdojotw/gmock-mirror,plexinc/googlemock,duanhjlt/gmock,open-eid/googlemock,guywithnose/android-googlemock,saruneko/gmock,cpp-mirrors/gmock,svn2github/googlemock,okwasi/googlemock,e2/googlemock,bref/googlemock,okwasi/googlemock,svn2github/googlemock,duanhjlt/gmock,MrKepzie/google-mock,svn2github/googlemock,evadeflow/gmock,codingdojotw/gmock-mirror,saruneko/gmock,MrKepzie/google-mock,Chilledheart/googlemock,svn2github/chromium-gmock,rtc-draper/googlemock,yquant/gmock,saruneko/gmock,martindam/googlemock,cryporchild/googlemock,martindam/googlemock,cpp-mirrors/gmock,yquant/gmock,cpp-netlib/gmock,bpsinc-native/src_testing_gmock,cpp-netlib/gmock,yquant/gmock,open-eid/googlemock,svn2github/chromium-gmock,guywithnose/android-googlemock,mydrive/gmock,martinhansdk/googlemock,openpeer/gmock,Chilledheart/googlemock,sensorflo/gmock,svn2github/chromium-gmock,ttyangf/pdfium_gmock,ttyangf/pdfium_gmock,ttyangf/pdfium_gmock,okwasi/googlemock,bpsinc-native/src_testing_gmock,openpeer/gmock,sensorflo/gmock,rtc-draper/googlemock,mydrive/gmock,istarc/googlemock,duanhjlt/gmock,openpeer/gmock,codingdojotw/gmock-mirror,istarc/googlemock,e2/googlemock,cpp-mirrors/gmock,open-eid/googlemock,evadeflow/gmock,evadeflow/gmock,MrKepzie/google-mock,Chilledheart/googlemock,plexinc/googlemock,cryporchild/googlemock,cpp-netlib/gmock,rtc-draper/googlemock