From a40ffbae76bc498e2f52d54de95936521bb71aa0 Mon Sep 17 00:00:00 2001
From: "cshapiro@google.com" <cshapiro@google.com>
Date: Thu, 14 Jun 2012 01:02:08 +0000
Subject: [PATCH] Fix includes to unbreak the Windows build.

Review URL: https://chromiumcodereview.appspot.com//10539151

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@8638 260f80e4-7a28-3924-810f-c04153c831b5
---
 runtime/platform/globals.h       | 6 +++---
 runtime/vm/heap_profiler.cc      | 4 ----
 runtime/vm/heap_profiler_test.cc | 4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
index 67439a49919..a7bd7d31b8d 100644
--- a/runtime/platform/globals.h
+++ b/runtime/platform/globals.h
@@ -21,10 +21,12 @@
 #define NOMCX
 
 #include <windows.h>
+#include <winsock2.h>
 #include <Rpc.h>
 #endif
 
 #if !defined(_WIN32)
+#include <arpa/inet.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <unistd.h>
@@ -39,8 +41,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <cstdlib>
-#include <sstream>
 
 #if defined(_WIN32)
 #include "platform/c99_support_win.h"
@@ -206,7 +206,7 @@ private:                                                                       \
 public:                                                                        \
   void operator delete(void* pointer) {                                        \
     fprintf(stderr, "unreachable code\n");                                     \
-    std::abort();                                                              \
+    abort();                                                                   \
   }                                                                            \
 private:                                                                       \
   void* operator new(size_t size);
diff --git a/runtime/vm/heap_profiler.cc b/runtime/vm/heap_profiler.cc
index acda04d9231..07310eeef2b 100644
--- a/runtime/vm/heap_profiler.cc
+++ b/runtime/vm/heap_profiler.cc
@@ -4,10 +4,6 @@
 
 #include "vm/heap_profiler.h"
 
-#include <stdio.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-
 #include "vm/dart_api_state.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
diff --git a/runtime/vm/heap_profiler_test.cc b/runtime/vm/heap_profiler_test.cc
index 6303758d738..8aecc0489c6 100644
--- a/runtime/vm/heap_profiler_test.cc
+++ b/runtime/vm/heap_profiler_test.cc
@@ -2,10 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#include <arpa/inet.h>
-#include <sys/time.h>
-
-
 #include "vm/heap_profiler.h"
 #include "vm/growable_array.h"
 #include "vm/unit_test.h"