diff options
| author | unknown <tim@white.box> | 2001-08-21 19:14:04 -0400 |
|---|---|---|
| committer | unknown <tim@white.box> | 2001-08-21 19:14:04 -0400 |
| commit | 65bc433d812251e87920198b9c3ab981b142cc80 (patch) | |
| tree | dce86f855e4d7021278148a09fb15136265231be | |
| parent | 3a6db1d65f0459e0b7b993afbe247c8d6f62849b (diff) | |
| download | mariadb-git-65bc433d812251e87920198b9c3ab981b142cc80.tar.gz | |
Portability fix in mysqlbinlog.cc (include my_pthread.h)
Clean up 'unused argument' warnings
Add extern "C" { ... } in my_pthread.h
client/mysqlbinlog.cc:
Include my_pthread.h before thr_alarm.h (otherwise pthread_t isn't
declared yet).
client/mysqltest.c:
Fix unused argument warnings.
client/thread_test.c:
Fix unused argument warnings.
include/my_pthread.h:
Put extern "C" { ... } wrappers, because this file is included from
some C++ files.
| -rw-r--r-- | client/mysqlbinlog.cc | 1 | ||||
| -rw-r--r-- | client/mysqltest.c | 8 | ||||
| -rw-r--r-- | client/thread_test.c | 2 | ||||
| -rw-r--r-- | include/my_pthread.h | 9 |
4 files changed, 15 insertions, 5 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 757e9dce810..f698ceaf5d4 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -21,6 +21,7 @@ #include <m_string.h> #include <my_sys.h> #include <getopt.h> +#include <my_pthread.h> #include <thr_alarm.h> #include <mysql.h> #include "log_event.h" diff --git a/client/mysqltest.c b/client/mysqltest.c index f6d87352a6c..6c5f1c57f6a 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -247,10 +247,10 @@ static int eval_result = 0; /* Disable functions that only exist in MySQL 4.0 */ #if MYSQL_VERSION_ID < 40000 -static void mysql_enable_rpl_parse(MYSQL* mysql) {} -static void mysql_disable_rpl_parse(MYSQL* mysql) {} -static int mysql_rpl_parse_enabled(MYSQL* mysql) { return 1; } -static int mysql_rpl_probe(MYSQL *mysql) { return 1; } +static void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +static void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +static int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } +static int mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } #endif diff --git a/client/thread_test.c b/client/thread_test.c index 4d3ae6e7ddd..dbe2acee8db 100644 --- a/client/thread_test.c +++ b/client/thread_test.c @@ -19,7 +19,7 @@ #ifndef THREAD -int main(int argc, char **argv) +int main(void) { printf("This test must be compiled with multithread support to work\n"); exit(1); diff --git a/include/my_pthread.h b/include/my_pthread.h index 652bdd205c0..767722a2050 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -20,6 +20,10 @@ #ifndef _my_pthread_h #define _my_pthread_h +#ifdef __cplusplus +extern "C" { +#endif + #include <errno.h> #ifndef ETIME #define ETIME ETIMEDOUT /* For FreeBSD */ @@ -576,4 +580,9 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); #endif /* SAFE_STATISTICS */ #endif /* HAVE_ATOMIC_ADD */ #endif /* thread_safe_increment */ + +#ifdef __cplusplus +} +#endif + #endif /* _my_ptread_h */ |