Merged the Python 3.0 support branch. The merging progress is not so smooth, so hope this commit won't make anything broken.
This is the (incomplemete) log produced by svnmerge.py: Merged revisions 10405-10409,10420-10422,10426,10438,10445,10451,10454-10465,10467,10473-10475,10485,10488-10489,10493-10495,10497,10509-10510,10513-10514,10517,10520,10525,10528-10529,10533-10535,10554-10557,10570,10573,10593,10614,10666-10669,10673,10678,10687,10690,10704-10706,10731,10744,10750-10752,10755,10759,10770,10775-10776,10813,10819 via svnmerge from https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10834 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
761ef2b98f
commit
3d8ddfc442
75 changed files with 1603 additions and 246 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#ifndef SWIG_CSTRING_UNIMPL
|
||||
|
||||
%cstring_input_binary(char *in, int n);
|
||||
%cstring_input_binary(char *str_in, int n);
|
||||
%cstring_bounded_output(char *out1, 512);
|
||||
%cstring_chunk_output(char *out2, 64);
|
||||
%cstring_bounded_mutable(char *out3, 512);
|
||||
|
|
@ -22,13 +22,13 @@
|
|||
|
||||
%inline %{
|
||||
|
||||
int count(char *in, int n, char c) {
|
||||
int count(char *str_in, int n, char c) {
|
||||
int r = 0;
|
||||
while (n > 0) {
|
||||
if (*in == c) {
|
||||
if (*str_in == c) {
|
||||
r++;
|
||||
}
|
||||
in++;
|
||||
str_in++;
|
||||
--n;
|
||||
}
|
||||
return r;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue