Bug 943235: undef LOG at the end of nsStorageStream.cpp, to prevent it from polluting other .cpp files and triggering "redefined" build warnings when we build in unified mode. r=froydnj
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 26 Nov 2013 09:42:58 -0800
changeset 157558 150932cb83bfe100c1f452a7c4ac734374e4d8e2
parent 157557 c713a29dd25a83821bf618dbea2973367c4af9fb
child 157559 9f57d2519a475d7d89b8ff550603edd6f352f1df
push id36757
push userdholbert@mozilla.com
push dateTue, 26 Nov 2013 17:43:37 +0000
treeherdermozilla-inbound@9f57d2519a47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs943235
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 943235: undef LOG at the end of nsStorageStream.cpp, to prevent it from polluting other .cpp files and triggering "redefined" build warnings when we build in unified mode. r=froydnj
xpcom/io/nsStorageStream.cpp
--- a/xpcom/io/nsStorageStream.cpp
+++ b/xpcom/io/nsStorageStream.cpp
@@ -534,8 +534,12 @@ NS_NewStorageStream(uint32_t segmentSize
     nsresult rv = storageStream->Init(segmentSize, maxSize, nullptr);
     if (NS_FAILED(rv)) {
         NS_RELEASE(storageStream);
         return rv;
     }
     *result = storageStream;
     return NS_OK;
 }
+
+// Undefine LOG, so that other .cpp files (or their includes) won't complain
+// about it already being defined, when we build in unified mode.
+#undef LOG