---

yaml
---
r: 147438
b: refs/heads/try2
c: f82246f
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 32e730f122f06202eb48aefcc2cef6ee3e279a2f
+refs/heads/try2: f82246f56db34b52fac8466659ad454f1610280c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/rt/rust_builtin.c

@@ -10,28 +10,35 @@
 
 /* Foreign builtins. */
 
-#include "rust_globals.h"
 #include "vg/valgrind.h"
 
+#include <stdint.h>
 #include <time.h>
-
-#ifdef __APPLE__
-    #include <TargetConditionals.h>
-    #include <mach/mach_time.h>
-
-    #if (TARGET_OS_IPHONE)
-        extern char **environ;
-    #else
-        #include <crt_externs.h>
-    #endif
-#endif
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
 
 #if !defined(__WIN32__)
 #include <sys/time.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <pthread.h>
+#else
+#include <windows.h>
+#include <wincrypt.h>
+#include <stdio.h>
+#include <tchar.h>
 #endif
 
-#ifdef __FreeBSD__
-extern char **environ;
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#include <mach/mach_time.h>
+
+#if !(TARGET_OS_IPHONE)
+#include <crt_externs.h>
+#endif
 #endif
 
 #ifdef __ANDROID__
@@ -57,6 +64,16 @@ timegm(struct tm *tm)
 }
 #endif
 
+#ifdef __APPLE__
+#if (TARGET_OS_IPHONE)
+extern char **environ;
+#endif
+#endif
+
+#if defined(__FreeBSD__) || defined(__linux__) || defined(__ANDROID__)
+extern char **environ;
+#endif
+
 #if defined(__WIN32__)
 char**
 rust_env_pairs() {
@@ -323,8 +340,6 @@ rust_mktime(rust_tm* timeptr) {
 }
 
 #ifndef _WIN32
-#include <sys/types.h>
-#include <dirent.h>
 
 DIR*
 rust_opendir(char *dirname) {
@@ -419,9 +434,6 @@ rust_unset_sigprocmask() {
 
 #else
 
-#include <signal.h>
-#include <unistd.h>
-
 void
 rust_unset_sigprocmask() {
     // this can't be safely converted to rust code because the

branches/try2/src/rt/rust_globals.h

@@ -10,7 +10,8 @@
 
 // Helper functions used only in tests
 
-#include "rust_globals.h"
+#include <stdint.h>
+#include <assert.h>
 
 // These functions are used in the unit tests for C ABI calls.
 

branches/try2/src/rt/rust_test_helpers.c

@@ -19,7 +19,7 @@
   switch to the C stack.
  */
 
-#include "rust_globals.h"
+#include <stdint.h>
 
 //Unwinding ABI declarations.
 typedef int _Unwind_Reason_Code;

branches/try2/src/rt/rust_upcall.c

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#include <stdlib.h>
+#include <assert.h>
+
 #ifdef __WIN32__
 // For alloca
 #include <malloc.h>
@@ -20,8 +23,6 @@
 
 #include "uv.h"
 
-#include "rust_globals.h"
-
 void*
 rust_uv_loop_new() {
 // XXX libuv doesn't always ignore SIGPIPE even though we don't need it.