diff options
| author | Haoyu Bai <divinekid@gmail.com> | 2009-01-30 10:32:59 +0000 |
|---|---|---|
| committer | Haoyu Bai <divinekid@gmail.com> | 2009-01-30 10:32:59 +0000 |
| commit | 1d1ee5bae746a74eb9f971f4bff63b9edbbf00ce (patch) | |
| tree | 6173a7e6e1fecd1260b92e18b49ac216c36d3d34 /Source | |
| parent | 47b482516807608a088748b403414e094cd239a3 (diff) | |
| download | swig-1d1ee5bae746a74eb9f971f4bff63b9edbbf00ce.tar.gz | |
Fix broken caused by merge
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11098 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Preprocessor/cpp.c | 2 | ||||
| -rw-r--r-- | Source/Swig/cwrap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c index d93afc09a..81646171a 100644 --- a/Source/Preprocessor/cpp.c +++ b/Source/Preprocessor/cpp.c @@ -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 { diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index 49d2c1e9b..3bdf2b13e 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -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); |