jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken caused by merge

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11098 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Haoyu Bai 2009-01-30 10:32:59 +00:00
commit 1d1ee5bae7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Preprocessor/cpp.c
View file

@ -86,7 +86,7 @@ static String *cpp_include(const_String_or_char_ptr fn, int sysfile) {
}
if (!s) {
/* XXX(bhy) may not need the seek */
// Seek(fn, 0, SEEK_SET);
/* Seek(fn, 0, SEEK_SET); */
if (ignore_missing) {
Swig_warning(WARN_PP_MISSING_FILE, Getfile(fn), Getline(fn), "Unable to find '%s'\n", fn);
} else {

4
Source/Swig/cwrap.c
View file

@ -683,7 +683,7 @@ String *Swig_cppdestructor_call(Node *n) {
*
* ----------------------------------------------------------------------------- */
String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, String *self, int varcref) {
String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, const_String_or_char_ptr self, int varcref) {
String *func;
String *pname0 = Swig_cparm_name(0, 0);
String *pname1 = Swig_cparm_name(0, 1);
@ -718,7 +718,7 @@ String *Swig_cmemberset_call(const_String_or_char_ptr name, SwigType *type, Stri
*
* ----------------------------------------------------------------------------- */
String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, String *self, int varcref) {
String *Swig_cmemberget_call(const_String_or_char_ptr name, SwigType *t, const_String_or_char_ptr self, int varcref) {
String *func;
String *call;
String *pname0 = Swig_cparm_name(0, 0);