Bug 853350 - followup to make windows happy r=me
authorFabrice Desré <fabrice@mozilla.com>
Thu, 09 May 2013 18:04:56 -0700
changeset 142434 ff15e9b25bdd7a7a0599221f487b72520dd11551
parent 142433 1683f7d9f105bb0a5e922294b3951b4df9c3017b
child 142435 b1c6b87e6e5b1056b941f162fb060e40fbcd513a
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs853350
milestone23.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 853350 - followup to make windows happy r=me
toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp
--- a/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp
+++ b/toolkit/components/diskspacewatcher/DiskSpaceWatcher.cpp
@@ -81,16 +81,21 @@ DiskSpaceWatcher::Observe(nsISupports* a
 
 /* readonly attribute bool isDiskFull; */
 NS_IMETHODIMP DiskSpaceWatcher::GetIsDiskFull(bool* aIsDiskFull)
 {
   *aIsDiskFull = sIsDiskFull;
   return NS_OK;
 }
 
+// GetFreeSpace is a macro on windows, and that messes up with the c++
+// compiler.
+#ifdef XP_WIN
+#undef GetFreeSpace
+#endif
 /* readonly attribute long freeSpace; */
 NS_IMETHODIMP DiskSpaceWatcher::GetFreeSpace(uint64_t* aFreeSpace)
 {
   *aFreeSpace = sFreeSpace;
   return NS_OK;
 }
 
 // static