Merge 343-Win32-Fix which fixes hangs and crashes at shutdown on Windows.

1 files changed, 11 insertions, 9 deletions

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index a0a0e8943..2225631a6 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -12,25 +12,27 @@
  * This file is dual licensed under LGPL v2.1 and the Scintilla license (http://www.scintilla.org/License.txt).
  */
 
-#import "Platform.h"
-#import "ScintillaView.h"
-#import "ScintillaCocoa.h"
-#import "PlatCocoa.h"
+#include <assert.h>
+#include <sys/time.h>
 
+#include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#include <cstdlib>
-#include <assert.h>
-#include <sys/time.h>
+
 #include <stdexcept>
 #include <vector>
 #include <map>
 
+#import <Foundation/NSGeometry.h>
+
+#import "Platform.h"
+#import "ScintillaView.h"
+#import "ScintillaCocoa.h"
+#import "PlatCocoa.h"
+
 #include "StringCopy.h"
 #include "XPM.h"
 
-#import <Foundation/NSGeometry.h>
-
 using namespace Scintilla;
 
 extern sptr_t scintilla_send_message(void* sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam);