From 481191961940ac85456c61e54e98ed721e82bc6e Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Thu, 19 Jul 2001 21:03:19 +0000 Subject: [PATCH] Converted the project to CW6 (it hadn't been compiled in a long time), added a carbon target and added 2 missing routines in Carbon. --- Mac/Contrib/osam/OSAm.prj | Bin 49980 -> 80703 bytes Mac/Contrib/osam/ScriptRunner.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Mac/Contrib/osam/OSAm.prj b/Mac/Contrib/osam/OSAm.prj index 3215c1c185350e5b4e03caa165d20464a1c16ed3..87ce163394bf0c61fcea7b18abce39ba5f0ebfa8 100644 GIT binary patch literal 80703 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 delta 4575 zc-o~{4N#QF8Q%TAyW{vrJq7vm?tlO%B4R~Au%P$WRv-&>PBwq*ZiiHdH~tq#P(0$Oe?kx|7H1 zM?uZP`je+c7DH_U&?II~86RtaS`^S2poz?tvO3_*90d}lAViAU)5HP74H==A2yXWUhmhI9;sVy4USd!OP_`&NGk)O7LPL5j5p-}Q z(Z$bvwcMRwQ8m4&cv`;K#cHQm0?q{Xf!E30_13^l0~pA(oEMl9WD*HW5$wEm$bO41 zS|*_lDqr+58O<%=T%;P?J!_)Onk(aaZPRJ6+DezPW9>#Zv^6W>92VWu+T!a{v#vmS zCktBRB10>%zt1mZ-_14!=j2l>tYQvZMb(O=?nbXe*MTFKDqrSCNy?vc^%5vE78ude z>5aY)kCLAM6$QwsbAV8kyaF8#Fd7`lB7$9?k^!!9Q!+jk4Lesge826M@=B3WV)eyk z%+aZ159Zt8I58|{l}fm&40bGCAN<%rO`<26N-TcO_#w0DJ{l=~D@;-<9wBhH_PEWc zUL_LA36u}-o0Ugp+H2EOw!U+aOoLu8=c6U>5<7sO#+1%pOV4r zTfT;!-}E?MPiRb6m)o;^wX2aU*A(Hbubb*^7K*M7CgjmLrN|d0nFdNw_w^+xg(S!v zg?culeOd5`mBz7z=6`}5vnBSEWkzN2qi70J(Nm*RTO>*B!xfc^zC|bLDywSh)Z@wE z7|c~>QDv`89TzF1jRp_q(hEk3Vj{H9F@na(eRX-zQsuMTdpP)BJ`LoG`_dqBflwmJ z;g(6|R#9PJ7H3n+hL>PoUXrcey8P-WF#{C94&_wIF`e@1yhN(p+EGc_o`+lFxviV= z&Viaiag|-8i66D@BXYq-Vmf*Yc(0|{HZ^|C7CVN;WgUlRKQ`&6IR}*U*H_aCFBlKJ zuaa4f>rUjf_S28rU*~%bXR!2<(thK^|H;7VtSI-oNvnBkqw9GFumfA=@8txVBB4Lmya35#!N0$(yDj=Up(3?FR*(x!BlmZy1}@8Ie{(!*4pB zDzMVtyK4p$l6V=IKBQ@7((^;?e296qI)wGC*A0r|Ap*bKCg7XMDz!t%!BqXorc6%~U%^KN2Fu;`@-9_=LUF zi3o`ZDSH<(hui0MY0NP-JqD5VxP5IZ9vnS}CZ>gTOE^6Nx?7%33;v*hHu)`Yq2~*B zVPCv&FAQTBhD*5jRJYINc?K^C;~$3iLV%?EhTFH|8Tp-nU{cC+``f%N13OM$fvn$I z*DyNr2y25 z^{s`l@d(~Au3N;UsOdk#;zqvk9W<*~#mS07mSNv>73y^YuMU}>eLe;-vjvX*aU4H{ zU+Os=&nSWQseyNF{Iv*qQ7S2Tf7c-<%>ar`P>#3+DEsC=i0&QTzn!AOM) zlJAO$9fS5C;UXN*ui>u>H4?=uY8mH$3S;@DLjRVpAS>n*(m%sNLdRv0#qtS18wd3U zG2W=D;6I;3eYubv38}!5l>+rfu`r(g0>@|KW|}xY+5by8aS~@#i(%*r-cfN4vcr5r z_1~c0EH*R^Gd{ivS8L&TB}hWzBDMea58|bQL-Dm?<@hy^c)cM00lI5jhaWpO;2T3& z{iJ_r)_!F?)ZOBG!T$Xme;)x6bd<%a_ZL6$0W@=tXWBJBfp?(Z#__7Xn%89c(f-?c z$GqQ#+{W(77OyHuZ$Hx9CKL7U<@n;8A+NE&b{YU5#~aRsyv8Bp<8-yyP?M&zvna(* z;s2IYO=m;Vde;aYpVqAXlcP}Y;<)R3u(0r&E68-MkX%a0YaAIUiFHEM1sb0|Jd_BQ z-R}V(zi=DhZ1IMKv@JR0Hjdf};$4Zx6%}$D`&F}eYeL#tqj}AtdD^9Bc}eq{n~}JQ?Hu1KX_1Cq9n@g3-2+j$>!xrLte(OvC;7QDFjqN5l7`eH;+@ NUo`ygXW|bH`7hEua5Mk_ diff --git a/Mac/Contrib/osam/ScriptRunner.c b/Mac/Contrib/osam/ScriptRunner.c index 7fd68f64737e..bf77d6bfd4a4 100644 --- a/Mac/Contrib/osam/ScriptRunner.c +++ b/Mac/Contrib/osam/ScriptRunner.c @@ -21,7 +21,26 @@ #include #include +#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); -- 2.47.3