diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 10 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index d6eabc1a567..5b2379e91ec 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1269,12 +1269,10 @@ You can turn off this feature to get a quicker startup with -A\n\n"); /* for gnu readline */ #ifndef HAVE_INDEX -#ifdef __cplusplus extern "C" { -#endif -extern char *index(const char *,pchar c),*rindex(const char *,pchar); +extern char *index(const char *,int c),*rindex(const char *,int); -char *index(const char *s,pchar c) +char *index(const char *s,int c) { for (;;) { @@ -1283,7 +1281,7 @@ char *index(const char *s,pchar c) } } -char *rindex(const char *s,pchar c) +char *rindex(const char *s,int c) { reg3 char *t; @@ -1291,10 +1289,8 @@ char *rindex(const char *s,pchar c) do if (*s == (char) c) t = (char*) s; while (*s++); return (char*) t; } -#ifdef __cplusplus } #endif -#endif #endif /* HAVE_READLINE */ diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index f7b381d72fa..4109fbd76d4 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -552,3 +552,5 @@ int main(int argc, char** argv) #else #include "log_event.cc" #endif + +FIX_GCC_LINKING_PROBLEM |