DELTA 299605 0 335 SVN> G 2F"F07:40:22 UTC +++ src/lib/libast/features/wchar @@ -51,6 +51,7 @@ endifENDREP DELTA 346423 0 525 SVN|= l+j(Tj06-11-07 22:29:04 UTC +++ src/lib/libast/hash/hashalloc.c @@ -151,7 +151,16 @@ hashalloc(Hash_table_t* ref, ...) va_copy(*vp, ap); vp++; } +#if __clang__ && __SIZEOF_POINTER__ == 4 + { + va_list np; + + np = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, np); + } +#else va_copy(ap, va_listval(va_arg(ap, va_listarg))); +#endifENDREP DELTA 346423 538 300 SVN>su "D@Q<s--- src/lib/libast/string/tokscan.c.orig 2006-11-07 22:29:31 UTC +++ src/lib/libast/string/tokscan.c @@ -233,7 +233,16 @@ tokscan(register char* s, char** nxt, co+#if __clang__ && __SIZEOF_POINTER__ == 4 + { + va_list np; + + np = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, np); + } +#else va_copy(ap, va_listval(va_arg(ap, va_listarg))); +#endifENDREP id: 5-299605.0.r424858/956 type: file pred: 5-299605.0.r340725/10844876 count: 3 text: 424858 0 92 276 f7a821cf7245ca15a07512122a147dd8 a108ed15943b1c5a951b95ed08dd0fe30d45c341 424857-93tm/_5 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/shells/ksh93/files/patch-src-lib-libast-features-wchar copyroot: 0 / id: 4-346423.0.r424858/1288 type: file pred: 4-346423.0.r346423/851 count: 1 text: 424858 118 385 445 dce6cba00ca582a784b509225f4ac9ff 4a09f3e2a59ef37aaee2b71d3b8d6ea714bcdfde 424857-93tm/_6 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c copyroot: 0 / id: 7-346423.0.r424858/1621 type: file pred: 7-346423.0.r346423/1152 count: 1 text: 424858 529 399 499 9ac302c22a021e0b84994fd9822cabed 46e0d91312e6f96ec37ba69a3597fc054f53b275 424857-93tm/_7 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c copyroot: 0 / PLAIN K 35 patch-src-lib-libast-features-wchar V 27 file 5-299605.0.r424858/956 K 37 patch-src-lib-libast-hash-hashalloc.c V 28 file 4-346423.0.r424858/1288 K 37 patch-src-lib-libast-string-tokscan.c V 28 file 7-346423.0.r424858/1621 END ENDREP id: 3-299605.0.r424858/2200 type: dir pred: 3-299605.0.r346423/1705 count: 4 text: 424858 1955 232 0 85029453c5115bb8fe31434880361be0 cpath: /head/shells/ksh93/files copyroot: 0 / PLAIN K 8 Makefile V 29 file 4-23408.0.r417110/122828 K 8 distinfo V 26 file 7-23408.0.r324455/693 K 5 files V 27 dir 3-299605.0.r424858/2200 K 9 pkg-descr V 31 file f-23408.0.r340718/11805320 K 9 pkg-plist V 27 file h-23408.0.r372496/3419 END ENDREP id: 2-23408.0.r424858/2632 type: dir pred: 2-23408.0.r417110/123378 count: 94 text: 424858 2381 238 0 5a944587a061e6ee1318173b8af2c1b9 cpath: /head/shells/ksh93 copyroot: 0 / PLAIN K 9 44bsd-csh V 28 dir 2-276600.0.r422591/75414 K 8 Makefile V 23 file x-6.0.r415339/1712 K 5 ambit V 29 dir 4-280731.0.r412349/895642 K 4 bash V 23 dir 10-6.0.r423003/5787 K 15 bash-completion V 29 dir 4-89798.0.r424427/1136434 K 11 bash-static V 27 dir 2-226718.0.r379349/1367 K 5 bashc V 26 dir 4-208845.0.r358751/949 K 2 ch V 29 dir 4-174571.0.r415500/327446 K 4 dash V 29 dir 4-244580.0.r415500/328089 K 2 es V 25 dir r-2055.0.r363330/1425 K 3 esh V 25 dir 2-19045.0.r407990/711 K 2 fd V 25 dir j-2859.0.r396419/2340 K 4 fish V 27 dir 4-186043.0.r422984/1189 K 5 flash V 26 dir 2-24564.0.r415028/1988 K 11 heirloom-sh V 28 dir 4-212287.0.r358516/38291 K 9 hs-shelly V 32 dir 11u-394918.0.r394918/1354123 K 4 ibsh V 30 dir 4-148029.0.r417166/1045606 K 7 jailkit V 29 dir 4-240832.0.r414892/600398 K 5 klish V 27 dir 4-407578.0.r420048/1151 K 5 ksh93 V 26 dir 2-23408.0.r424858/2632 K 6 lshell V 27 dir 4-238991.0.r420446/1535 K 4 mksh V 27 dir 4-168483.0.r420256/1057 K 10 nologinmsg V 25 dir 4-62780.0.r371845/544 K 3 osh V 26 dir 4-36449.0.r406248/1014 K 18 p5-Bash-Completion V 29 dir 4-284156.0.r412349/897117 K 13 p5-Shell-Perl V 29 dir 4-208599.0.r412349/897846 K 33 p5-Term-Bash-Completion-Generator V 29 dir 4-380738.0.r412349/898584 K 15 p5-Term-ShellUI V 29 dir 4-183234.0.r417207/691127 K 5 pdksh V 23 dir 2-622.0.r422361/634 K 14 pear-PHP_Shell V 30 dir 4-197141.0.r419057/1047445 K 3 psh V 28 dir f-24389.0.r412349/900080 K 2 rc V 28 dir 18-2055.0.r418840/831655 K 4 rssh V 29 dir 5-218955.0.r412349/900818 K 4 sash V 28 dir 4-25291.0.r415500/328822 K 7 scponly V 25 dir 4-66096.0.r402366/959 K 13 shell-include V 27 dir 4-190502.0.r385855/2382 K 8 tcsh_nls V 26 dir 5-292544.0.r383606/474 K 6 tcshrc V 28 dir 4-88875.0.r415500/329562 K 4 v7sh V 30 dir 4-111975.0.r400848/1005116 K 8 viewglob V 29 dir 4-119373.0.r412349/901571 K 5 vshnu V 28 dir 4-38706.0.r412349/902276 K 3 wcd V 27 dir 4-387887.0.r409436/1002 K 3 zsh V 24 dir 2-948.0.r424080/2102 K 20 zsh-navigation-tools V 27 dir 4-415339.0.r419221/1161 END ENDREP id: w-6.0.r424858/4852 type: dir pred: w-6.0.r424427/1138672 count: 1642 text: 424858 2808 2031 0 263bdeb5bf6a2c887086c6f6a5dc7c77 cpath: /head/shells copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 27 file 1-411777.0.r411777/210 K 10 .gitignore V 26 file 1-348322.0.r376072/79 K 7 CHANGES V 27 file 1-99373.0.r421995/2340 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r404934/49 K 4 GIDs V 29 file 1-168311.0.r424743/11194 K 8 Keywords V 27 dir 1-314142.0.r419368/1305 K 5 LEGAL V 24 file 1-748.0.r420195/336 K 5 MOVED V 27 file 1-69878.0.r424689/1581 K 8 Makefile V 24 file 1-6.0.r424411/75633 K 2 Mk V 22 dir 1-5.0.r424842/9960 K 6 README V 25 file 1-2408.0.r340854/956 K 9 Templates V 24 dir 1-2932.0.r414724/906 K 5 Tools V 26 dir 3-15302.0.r421545/3096 K 4 UIDs V 29 file 4-168311.0.r424743/11477 K 8 UPDATING V 28 file 1-102685.0.r424719/3578 K 13 accessibility V 27 dir 1-42583.0.r424411/90256 K 6 arabic V 27 dir 1-38973.0.r424411/91716 K 9 archivers V 25 dir 1-242.0.r424708/13942 K 5 astro V 25 dir 1-301.0.r424658/22564 K 5 audio V 25 dir 1-148.0.r424833/44685 K 4 base V 29 dir 1-420954.0.r424411/173309 K 10 benchmarks V 23 dir 1-62.0.r424690/5232 K 7 biology V 25 dir 1-9066.0.r424800/5772 K 3 cad V 24 dir 1-276.0.r424834/5350 K 7 chinese V 27 dir 1-3770.0.r424427/114491 K 5 comms V 24 dir 1-76.0.r424787/12218 K 10 converters V 26 dir 1-1561.0.r424732/10989 K 9 databases V 25 dir 1-771.0.r424778/54506 K 9 deskutils V 26 dir 1-2098.0.r424684/15225 K 5 devel V 25 dir 1-73.0.r424842/319289 K 3 dns V 26 dir 1-6145.0.r424779/12117 K 7 editors V 23 dir 4-6.0.r424727/17866 K 9 emulators V 25 dir 1-181.0.r424799/10797 K 7 finance V 26 dir 1-4110.0.r424740/12194 K 6 french V 28 dir 1-25673.0.r424411/753193 K 3 ftp V 24 dir 1-199.0.r424784/5266 K 5 games V 25 dir 1-104.0.r424852/58539 K 6 german V 27 dir 1-7451.0.r424411/857537 K 8 graphics V 25 dir 1-94.0.r424753/119510 K 6 hebrew V 28 dir 3-31142.0.r415873/388972 K 9 hungarian V 29 dir 1p-38973.0.r415873/390529 K 3 irc V 23 dir 1-42.0.r424771/8478 K 8 japanese V 26 dir 1-410.0.r424411/965852 K 4 java V 27 dir 1-2798.0.r424560/120444 K 6 korean V 27 dir 1-5873.0.r424427/748603 K 4 lang V 25 dir 1-15.0.r424842/337147 K 4 mail V 24 dir 1-57.0.r424796/43843 K 4 math V 25 dir 1-162.0.r424661/42172 K 4 misc V 24 dir 7-35.0.r424849/26460 K 10 multimedia V 25 dir d-333.0.r424856/25050 K 3 net V 25 dir 1-22.0.r424842/465759 K 6 net-im V 28 dir 15-11144.0.r424711/12266 K 8 net-mgmt V 26 dir r-1011.0.r424628/20720 K 7 net-p2p V 26 dir g-29106.0.r424838/6402 K 4 news V 27 dir 1-145.0.r424411/1419455 K 4 palm V 27 dir 1-6646.0.r418057/881288 K 6 polish V 30 dir tv-38973.0.r424427/1040088 K 10 ports-mgmt V 25 dir 1-5132.0.r424435/4762 K 10 portuguese V 28 dir 1-17842.0.r423622/320182 K 5 print V 24 dir 1-79.0.r424820/15344 K 7 russian V 28 dir 1-1559.0.r424411/1449707 K 7 science V 26 dir n-5356.0.r424777/10233 K 8 security V 25 dir 1-269.0.r424855/64544 K 6 shells V 22 dir w-6.0.r424858/4852 K 8 sysutils V 25 dir b-339.0.r424853/64220 K 8 textproc V 25 dir 1-322.0.r424731/96533 K 9 ukrainian V 28 dir g-39704.0.r415873/492962 K 10 vietnamese V 28 dir 1-4812.0.r424411/1724681 K 3 www V 26 dir 1-114.0.r424857/139857 K 3 x11 V 24 dir 1-16.0.r424836/25707 K 10 x11-clocks V 27 dir 1-931.0.r424411/1942872 K 11 x11-drivers V 30 dir 1-157567.0.r424427/1499964 K 6 x11-fm V 27 dir 1-691.0.r424427/1503012 K 9 x11-fonts V 25 dir 1-543.0.r424798/13984 K 11 x11-servers V 25 dir 1n-710.0.r421650/1238 K 10 x11-themes V 28 dir 1-14410.0.r424842/616223 K 12 x11-toolkits V 26 dir 1-120.0.r424842/632384 K 6 x11-wm V 23 dir 1-40.0.r424634/7990 END ENDREP id: 2-1.0.r424858/8563 type: dir pred: 2-1.0.r424857/143576 count: 421212 text: 424858 5018 3532 0 cbdc4bb1512538d90d8120cb85e3c0bf props: 7322 2587 45 0 7a04b33bf8e35fd5c3d111baaf403dc5 cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r424851/68623 K 4 head V 22 dir 2-1.0.r424858/8563 K 8 projects V 30 dir 0-377393.0.r378744/3577692 K 8 svnadmin V 22 dir 3-1.0.r424362/1241 K 4 tags V 22 dir 8-1.0.r421958/5118 END ENDREP id: 0.0.r424858/9001 type: dir pred: 0.0.r424857/144019 count: 424858 text: 424858 8778 210 0 3ff66da934719b4473a2b650604e3bbc props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 35 5-299605.0.t424857-93tm modify-file true false /head/shells/ksh93/files/patch-src-lib-libast-features-wchar 4-346423.0.t424857-93tm modify-file true false /head/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c 7-346423.0.t424857-93tm modify-file true false /head/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c 9001 9224