+++ /dev/null
-Bug 485019: #include <cstdio> where needed.
-
-diff --git a/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
---- a/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-+++ b/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
-@@ -36,6 +36,7 @@
-
- #include <cassert>
- #include <cstdlib>
-+#include <cstdio>
- #include <ctime>
- #include <linux/limits.h>
-
-diff --git a/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
---- a/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
-+++ b/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
-@@ -39,6 +39,7 @@
- #include <sys/wait.h>
-
- #include <cstdlib>
-+#include <cstdio>
- #include <ctime>
- #include <string.h>
-
-diff --git a/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- a/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-+++ b/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-@@ -30,6 +30,7 @@
- #include <a.out.h>
- #include <cstdarg>
- #include <cstdlib>
-+#include <cstdio>
- #include <cxxabi.h>
- #include <elf.h>
- #include <errno.h>
+++ /dev/null
-diff --git a/mailnews/imap/src/nsImapFlagAndUidState.cpp b/mailnews/imap/src/nsImapFlagAndUidState.cpp
---- a/mailnews/imap/src/nsImapFlagAndUidState.cpp
-+++ b/mailnews/imap/src/nsImapFlagAndUidState.cpp
-@@ -171,17 +171,17 @@ NS_IMETHODIMP nsImapFlagAndUidState::Res
- {
- PR_CEnterMonitor(this);
- if (!howManyLeft)
- fNumberOfMessagesAdded = fNumberDeleted = 0; // used space is still here
- if (m_customFlagsHash.IsInitialized())
- m_customFlagsHash.EnumerateRead(FreeCustomFlags, nsnull);
- memset(fFlags, 0, sizeof(imapMessageFlagsType) * fNumberOfMessageSlotsAllocated);
- m_customFlagsHash.Clear();
-- memset(fUids.Elements(), fNumberOfMessageSlotsAllocated * sizeof(nsMsgKey), 0);
-+ memset(fUids.Elements(), 0, fNumberOfMessageSlotsAllocated * sizeof(nsMsgKey));
- fPartialUIDFetch = PR_TRUE;
- PR_CExitMonitor(this);
- return NS_OK;
- }
-
-
- // Remove (expunge) a message from our array, since now it is gone for good