summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2014-07-31 02:04:10 (GMT)
committerKevin Walzer <kw@codebykevin.com>2014-07-31 02:04:10 (GMT)
commit5417a77e2d16b490402d0b5a04cda888e59a92ec (patch)
treee91e4b2a0c6e77cacad8c8c33b9108ed3d863ce5
parentf10bee2648e7e87c576a1afe761e8525255d3a7a (diff)
downloadtcl-ios.zip
tcl-ios.tar.gz
tcl-ios.tar.bz2
Testing patches for iOS supportios
-rw-r--r--generic/tclLoadNone.c2
-rw-r--r--unix/tclUnixPort.h6
2 files changed, 6 insertions, 2 deletions
diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
index c22c4c4..787fd5b 100644
--- a/generic/tclLoadNone.c
+++ b/generic/tclLoadNone.c
@@ -104,7 +104,7 @@ TclpLoadMemory(
int size, /* Dummy: unused by this implementation */
int codeSize, /* Dummy: unused by this implementation */
Tcl_LoadHandle *loadHandle, /* Dummy: unused by this implementation */
- Tcl_FSUnloadFileProc **unloadProcPtr)
+ Tcl_FSUnloadFileProc **unloadProcPtr, int flags)
/* Dummy: unused by this implementation */
{
Tcl_SetObjResult(interp, Tcl_NewStringObj("dynamic loading from memory "
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index f64d453..93c101f 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -544,7 +544,11 @@ extern int errno;
*---------------------------------------------------------------------------
*/
-#if defined(__APPLE__) && defined(__DYNAMIC__)
+#ifdef __APPLE__
+#include "TargetConditionals.h"
+#endif
+
+#if defined(__APPLE__) && defined(__DYNAMIC__) && TARGET_OS_MAC
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
# define USE_PUTENV 1