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 /mysys/mf_path.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 'mysys/mf_path.c')
| -rw-r--r-- | mysys/mf_path.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_path.c b/mysys/mf_path.c index 73e73cb7f76..d51cac732f5 100644 --- a/mysys/mf_path.c +++ b/mysys/mf_path.c @@ -42,7 +42,7 @@ char * my_path(char * to, const char *progname, ((prog=getenv("_")) != 0 && dirname_part(to, prog, &to_length)))) { - VOID(intern_filename(to,to)); + (void) intern_filename(to,to); if (!test_if_hard_path(to)) { if (!my_getwd(curr_dir,FN_REFLEN,MYF(0))) @@ -60,11 +60,11 @@ char * my_path(char * to, const char *progname, end= (char*) "/my/"; #endif } - VOID(intern_filename(to,end)); + (void) intern_filename(to,end); to=strend(to); if (to != start && to[-1] != FN_LIBCHAR) *to++ = FN_LIBCHAR; - VOID(strmov(to,own_pathname_part)); + (void) strmov(to,own_pathname_part); } DBUG_PRINT("exit",("to: '%s'",start)); DBUG_RETURN(start); |