diff options
author | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
---|---|---|
committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-08-03 13:31:36 (GMT) |
commit | cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14 (patch) | |
tree | 1995f01bd8828ae9647ad407e40dd8584ca843da /Mac/Contrib | |
parent | cb60dae6a1a7841138421866ea15870f6297cf8b (diff) | |
download | cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.zip cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.gz cpython-cbed91b4db6817b7bbbb12ede40bfb5d26a9bf14.tar.bz2 |
Merging appropriate 2.1.1 fixes back into the main trunk.
Diffstat (limited to 'Mac/Contrib')
-rw-r--r-- | Mac/Contrib/osam/OSAm.prj | bin | 49980 -> 80703 bytes | |||
-rw-r--r-- | Mac/Contrib/osam/ScriptRunner.c | 19 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Mac/Contrib/osam/OSAm.prj b/Mac/Contrib/osam/OSAm.prj Binary files differindex 3215c1c..87ce163 100644 --- a/Mac/Contrib/osam/OSAm.prj +++ b/Mac/Contrib/osam/OSAm.prj diff --git a/Mac/Contrib/osam/ScriptRunner.c b/Mac/Contrib/osam/ScriptRunner.c index 7fd68f6..bf77d6b 100644 --- a/Mac/Contrib/osam/ScriptRunner.c +++ b/Mac/Contrib/osam/ScriptRunner.c @@ -21,7 +21,26 @@ #include <script.h> #include <resources.h> +#ifdef TARGET_API_MAC_CARBON +static +p2cstr(StringPtr p) +{ + unsigned char *c = p; + int len = c[0]; + strncpy((char *)c+1, (char *)c, len); + c[len] = 0; +} +static c2pstr(const char *cc) +{ + char *c = (char *)cc; /* Ouch */ + int len = strlen(c); + + if ( len > 255 ) len = 255; + strncpy(c, c+1, len); + c[0] = len; +} +#endif OSAError LoadScriptingComponent (ComponentInstance * scriptingComponent); |