diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-11-24 16:54:59 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-11-24 16:54:59 +0300 |
| commit | 4cff617c2541279a53b92acbd4e4d8716dc54873 (patch) | |
| tree | 887f74eb880e4d9ff8b76ff93b221f7e6ec7fbe8 /client/mysqlimport.c | |
| parent | 26cd9abe4fcc058004ad8e656ff5b6713c0118f4 (diff) | |
| download | mariadb-git-4cff617c2541279a53b92acbd4e4d8716dc54873.tar.gz | |
Backport of:
----------------------------------------------------------------------
ChangeSet@1.2571, 2008-04-08 12:30:06+02:00, vvaintroub@wva. +122 -0
Bug#32082 : definition of VOID in my_global.h conflicts with Windows
SDK headers
VOID macro is now removed. Its usage is replaced with void cast.
In some cases, where cast does not make much sense (pthread_*, printf,
hash_delete, my_seek), cast is ommited.
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 5b8ec95c06d..969cff929d2 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -610,8 +610,8 @@ int main(int argc, char **argv) pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - VOID(pthread_mutex_init(&counter_mutex, NULL)); - VOID(pthread_cond_init(&count_threshhold, NULL)); + pthread_mutex_init(&counter_mutex, NULL); + pthread_cond_init(&count_threshhold, NULL); for (counter= 0; *argv != NULL; argv++) /* Loop through tables */ { @@ -650,8 +650,8 @@ int main(int argc, char **argv) pthread_cond_timedwait(&count_threshhold, &counter_mutex, &abstime); } pthread_mutex_unlock(&counter_mutex); - VOID(pthread_mutex_destroy(&counter_mutex)); - VOID(pthread_cond_destroy(&count_threshhold)); + pthread_mutex_destroy(&counter_mutex); + pthread_cond_destroy(&count_threshhold); pthread_attr_destroy(&attr); } else |