user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #10227 : kud1ing/rust/ios, r=alexcrichton

Browse source
This commit is contained in:
bors 2013-11-06 14:01:14 -08:00
commit 22eb11c09b
5 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rt/rust_builtin.cpp
View file

@ -17,8 +17,14 @@
#include <time.h>
#ifdef __APPLE__
#include <crt_externs.h>
#include <mach/mach_time.h>
#include <TargetConditionals.h>
#include <mach/mach_time.h>
#if (TARGET_OS_IPHONE)
extern char **environ;
#else
#include <crt_externs.h>
#endif
#endif
#if !defined(__WIN32__)
@ -57,7 +63,7 @@ rust_env_pairs() {
#else
extern "C" CDECL char**
rust_env_pairs() {
#ifdef __APPLE__
#if defined(__APPLE__) && !(TARGET_OS_IPHONE)
char **environ = *_NSGetEnviron();
#endif
return environ;