Bug 824459 - Thunderbird build is broken after Bug 807678 (Winsock2.h collision, and function name PostMessage collision). r=Standard8 CLOSED TREE

ldap/xpcom/src/nsLDAPConnection.cpp

@@ -8,12 +8,12 @@
 #include "nsIServiceManager.h"
 #include "nsStringGlue.h"
 #include "nsIComponentManager.h"
+#include "nsIDNSRecord.h"
 #include "nsLDAPConnection.h"
 #include "nsLDAPMessage.h"
 #include "nsThreadUtils.h"
 #include "nsIConsoleService.h"
 #include "nsIDNSService.h"
-#include "nsIDNSRecord.h"
 #include "nsIRequestObserver.h"
 #include "nsError.h"
 #include "nsLDAPOperation.h"

mailnews/base/util/nsMsgProtocol.cpp

@@ -36,6 +36,8 @@
 #include "nsAlgorithm.h"
 #include "mozilla/Services.h"
 
+#undef PostMessage // avoid to collision with WinUser.h
+
 using namespace mozilla;
 
 NS_IMPL_THREADSAFE_ADDREF(nsMsgProtocol)

mailnews/compose/src/nsSmtpProtocol.cpp

@@ -50,6 +50,8 @@
 #include <stdarg.h>
 #endif /* !XP_UNIX */
 
+#undef PostMessage // avoid to collision with WinUser.h
+
 static PRLogModuleInfo *SMTPLogModule = nullptr;
 
 /* the output_buffer_size must be larger than the largest possible line

mailnews/news/src/nsNNTPProtocol.cpp

@@ -82,6 +82,7 @@
 
 #undef GetPort  // XXX Windows!
 #undef SetPort  // XXX Windows!
+#undef PostMessage // avoid to collision with WinUser.h
 
 #define PREF_NEWS_CANCEL_CONFIRM  "news.cancel.confirm"
 #define PREF_NEWS_CANCEL_ALERT_ON_SUCCESS "news.cancel.alert_on_success"