===== client/mysqladmin.cc 1.124 vs edited =====
--- 1.124/client/mysqladmin.cc	2007-09-15 05:10:27 +02:00
+++ edited/client/mysqladmin.cc	2007-11-03 02:21:53 +01:00
@@ -344,8 +344,8 @@
   if (tty_password)
     opt_password = get_tty_password(NullS);
 
-  VOID(signal(SIGINT,endprog));			/* Here if abort */
-  VOID(signal(SIGTERM,endprog));		/* Here if abort */
+  (void)(signal(SIGINT,endprog));			/* Here if abort */
+  (void)(signal(SIGTERM,endprog));		/* Here if abort */
 
   if (opt_compress)
     mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
@@ -1071,7 +1071,7 @@
     puts("Any data stored in the database will be destroyed.\n");
     printf("Do you really want to drop the '%s' database [y/N] ",db);
     fflush(stdout);
-    VOID(fgets(buf,sizeof(buf)-1,stdin));
+    (void)(fgets(buf,sizeof(buf)-1,stdin));
     if ((*buf != 'y') && (*buf != 'Y'))
     {
       puts("\nOK, aborting database drop!");
===== client/mysqldump.c 1.300 vs edited =====
--- 1.300/client/mysqldump.c	2007-10-17 21:51:05 +02:00
+++ edited/client/mysqldump.c	2007-11-03 17:00:01 +01:00
@@ -2005,7 +2005,7 @@
   mysql_free_result(event_list_res);
 
   if (lock_tables)
-    VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+    (void)mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
   DBUG_RETURN(0);
 }
 
@@ -2199,7 +2199,7 @@
     DBUG_RETURN(1);
 
   if (lock_tables)
-    VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+    (void)mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
   DBUG_RETURN(0);
 }
 
@@ -4057,7 +4057,7 @@
     check_io(md_result_file);
   }
   if (lock_tables)
-    VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+    (void)mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
   if (flush_privileges && using_mysql_db == 0)
   {
     fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");
@@ -4131,7 +4131,7 @@
     check_io(md_result_file);
   }
   if (lock_tables)
-    VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+    (void)mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
   return 0;
 } /* dump_all_tables_in_db */
 
@@ -4300,7 +4300,7 @@
     check_io(md_result_file);
   }
   if (lock_tables)
-    VOID(mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES"));
+    (void)mysql_query_with_error_report(mysql, 0, "UNLOCK TABLES");
   DBUG_RETURN(0);
 } /* dump_selected_tables */
 
===== client/mysqlimport.c 1.86 vs edited =====
--- 1.86/client/mysqlimport.c	2007-09-15 05:10:41 +02:00
+++ edited/client/mysqlimport.c	2007-11-03 17:00:02 +01:00
@@ -601,8 +601,8 @@
     pthread_attr_setdetachstate(&attr,
                                 PTHREAD_CREATE_DETACHED);
 
-    VOID(pthread_mutex_init(&counter_mutex, NULL));
-    VOID(pthread_cond_init(&count_threshhold, NULL));
+    (void)pthread_mutex_init(&counter_mutex, NULL);
+    (void)pthread_cond_init(&count_threshhold, NULL);
 
     for (counter= 0; *argv != NULL; argv++) /* Loop through tables */
     {
@@ -641,8 +641,8 @@
       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));
+    (void)pthread_mutex_destroy(&counter_mutex);
+    (void)pthread_cond_destroy(&count_threshhold);
     pthread_attr_destroy(&attr);
   }
   else
===== client/mysqlslap.c 1.74 vs edited =====
--- 1.74/client/mysqlslap.c	2007-10-18 18:50:24 +02:00
+++ edited/client/mysqlslap.c	2007-11-03 17:00:02 +01:00
@@ -371,12 +371,12 @@
 
   slap_connect(&mysql, FALSE);
 
-  VOID(pthread_mutex_init(&counter_mutex, NULL));
-  VOID(pthread_cond_init(&count_threshhold, NULL));
-  VOID(pthread_mutex_init(&sleeper_mutex, NULL));
-  VOID(pthread_cond_init(&sleep_threshhold, NULL));
-  VOID(pthread_mutex_init(&timer_alarm_mutex, NULL));
-  VOID(pthread_cond_init(&timer_alarm_threshold, NULL));
+  (void)pthread_mutex_init(&counter_mutex, NULL);
+  (void)pthread_cond_init(&count_threshhold, NULL);
+  (void)pthread_mutex_init(&sleeper_mutex, NULL);
+  (void)pthread_cond_init(&sleep_threshhold, NULL);
+  (void)pthread_mutex_init(&timer_alarm_mutex, NULL);
+  (void)pthread_cond_init(&timer_alarm_threshold, NULL);
 
 
   /* Main iterations loop */
@@ -412,12 +412,12 @@
   if (opt_burnin)
     goto burnin;
 
-  VOID(pthread_mutex_destroy(&counter_mutex));
-  VOID(pthread_cond_destroy(&count_threshhold));
-  VOID(pthread_mutex_destroy(&sleeper_mutex));
-  VOID(pthread_cond_destroy(&sleep_threshhold));
-  VOID(pthread_mutex_destroy(&timer_alarm_mutex));
-  VOID(pthread_cond_destroy(&timer_alarm_threshold));
+  (void)pthread_mutex_destroy(&counter_mutex);
+  (void)pthread_cond_destroy(&count_threshhold);
+  (void)pthread_mutex_destroy(&sleeper_mutex);
+  (void)pthread_cond_destroy(&sleep_threshhold);
+  (void)pthread_mutex_destroy(&timer_alarm_mutex);
+  (void)pthread_cond_destroy(&timer_alarm_threshold);
 
   slap_close(&mysql);
 
===== client/mysqltest.c 1.319 vs edited =====
--- 1.319/client/mysqltest.c	2007-10-19 05:38:59 +02:00
+++ edited/client/mysqltest.c	2007-11-03 17:00:03 +01:00
@@ -497,12 +497,12 @@
   struct st_connection *cn= (struct st_connection*)arg;
 
   mysql_thread_init();
-  VOID(mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len));
+  (void)mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len);
 
   mysql_thread_end();
   pthread_mutex_lock(&cn->mutex);
   cn->query_done= 1;
-  VOID(pthread_cond_signal(&cn->cond));
+  (void)pthread_cond_signal(&cn->cond);
   pthread_mutex_unlock(&cn->mutex);
   pthread_exit(0);
   return 0;
@@ -8040,7 +8040,7 @@
     free_sets(&sets);
     DBUG_RETURN(0);
   }
-  VOID(make_new_set(&sets));			/* Set starting set */
+  (void)make_new_set(&sets);			/* Set starting set */
   make_sets_invisible(&sets);			/* Hide previus sets */
   used_sets=-1;
   word_states=make_new_set(&sets);		/* Start of new word */
@@ -8539,7 +8539,7 @@
   pa->flag[pa->typelib.count]=0;			/* Reset flag */
   pa->typelib.type_names[pa->typelib.count++]= (char*) pa->str+pa->length;
   pa->typelib.type_names[pa->typelib.count]= NullS;	/* Put end-mark */
-  VOID(strmov((char*) pa->str+pa->length,name));
+  (void)strmov((char*) pa->str+pa->length,name);
   pa->length+=length;
   DBUG_RETURN(0);
 } /* insert_pointer_name */
===== client/sql_string.cc 1.31 vs edited =====
--- 1.31/client/sql_string.cc	2007-08-13 15:11:09 +02:00
+++ edited/client/sql_string.cc	2007-11-03 02:21:53 +01:00
@@ -132,7 +132,7 @@
   int decpt,sign;
   char *pos,*to;
 
-  VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
+  (void)(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
   if (!my_isdigit(&my_charset_latin1, buff[1]))
   {						// Nan or Inf
     pos=buff+1;
===== extra/comp_err.c 1.36 vs edited =====
--- 1.36/extra/comp_err.c	2007-10-05 19:58:12 +02:00
+++ edited/extra/comp_err.c	2007-11-03 17:00:06 +01:00
@@ -1039,11 +1039,11 @@
       switch (*++pos) {
       case '\\':
       case '"':
-	VOID(strmov(pos - 1, pos));
+	(void)strmov(pos - 1, pos);
 	break;
       case 'n':
 	pos[-1]= '\n';
-	VOID(strmov(pos, pos + 1));
+	(void)strmov(pos, pos + 1);
 	break;
       default:
 	if (*pos >= '0' && *pos < '8')
@@ -1053,10 +1053,10 @@
 	    nr= nr * 8 + (*(pos++) - '0');
 	  pos -= i;
 	  pos[-1]= nr;
-	  VOID(strmov(pos, pos + i));
+	  (void)strmov(pos, pos + i);
 	}
 	else if (*pos)
-	  VOID(strmov(pos - 1, pos));		/* Remove '\' */
+	  (void)strmov(pos - 1, pos);		/* Remove '\' */
       }
     }
     else
===== extra/replace.c 1.25 vs edited =====
--- 1.25/extra/replace.c	2007-08-13 15:11:09 +02:00
+++ edited/extra/replace.c	2007-11-03 17:00:08 +01:00
@@ -311,7 +311,7 @@
   pa->flag[pa->typelib.count]=0;			/* Reset flag */
   pa->typelib.type_names[pa->typelib.count++]= (char*) (pa->str+pa->length);
   pa->typelib.type_names[pa->typelib.count]= NullS;	/* Put end-mark */
-  VOID(strmov((char*) pa->str + pa->length, name));
+  (void)strmov((char*) pa->str + pa->length, name);
   pa->length+=length;
   DBUG_RETURN(0);
 } /* insert_pointer_name */
@@ -433,7 +433,7 @@
     free_sets(&sets);
     DBUG_RETURN(0);
   }
-  VOID(make_new_set(&sets));			/* Set starting set */
+  (void)make_new_set(&sets);			/* Set starting set */
   make_sets_invisible(&sets);			/* Hide previus sets */
   used_sets=-1;
   word_states=make_new_set(&sets);		/* Start of new word */
===== include/config-win.h 1.105 vs edited =====
--- 1.105/include/config-win.h	2007-10-19 22:15:58 +02:00
+++ edited/include/config-win.h	2007-11-03 02:45:16 +01:00
@@ -17,26 +17,30 @@
 
 #define BIG_TABLES
 
-#ifdef __WIN2000__
-/* We have to do this define before including windows.h to get the AWE API
-functions */
-#define _WIN32_WINNT     0x0500
-#else
-/* Get NT 4.0 functions */
-#define _WIN32_WINNT     0x0400
+
+#ifdef _M_IX86
+  #if((defined _MSC_VER && _MSC_VER >=1400) ||defined(__WIN2000__))
+    #define _WIN32_WINNT     0x0500 
+  #else
+    #define _WIN32_WINNT     0x0400
+  #endif
+#else /*_WIN64 needs at least XP64 / Windows 2003*/
+  #define _WIN32_WINNT       0x0502
 #endif
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 /* Avoid endless warnings about sprintf() etc. being unsafe. */
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
-
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <sys/locking.h>
 #include <winsock2.h>
 #include <math.h>			/* Because of rint() */
 #include <fcntl.h>
 #include <io.h>
 #include <malloc.h>
+#include <stdlib.h>
 
 #define HAVE_SMEM 1
 
@@ -52,8 +56,8 @@
 #define MACHINE_TYPE	"ia64" 
 #elif defined(_M_IX86) 
 #define MACHINE_TYPE	"ia32" 
-#elif defined(_M_ALPHA) 
-#define MACHINE_TYPE	"axp" 
+#elif defined(_M_AMD64) 
+#define MACHINE_TYPE	"amd64" 
 #else
 #define MACHINE_TYPE	"unknown"	/* Define to machine type name */
 #endif 
===== include/my_atomic.h 1.7 vs edited =====
--- 1.7/include/my_atomic.h	2007-10-09 19:55:10 +02:00
+++ edited/include/my_atomic.h	2007-11-03 17:00:12 +01:00
@@ -75,11 +75,11 @@
 #ifndef make_atomic_load_body
 #define make_atomic_load_body(S)                                \
   ret= 0; /* avoid compiler warning */                          \
-  (void)(my_atomic_cas ## S(a, &ret, ret));
+  (void)my_atomic_cas ## S(a, &ret, ret);
 #endif
 #ifndef make_atomic_store_body
 #define make_atomic_store_body(S)                               \
-  (void)(my_atomic_fas ## S (a, v));
+  (void)my_atomic_fas ## S (a, v);
 #endif
 #endif
 
===== include/my_global.h 1.181 vs edited =====
--- 1.181/include/my_global.h	2007-10-19 22:15:58 +02:00
+++ edited/include/my_global.h	2007-11-03 02:32:14 +01:00
@@ -546,16 +546,7 @@
 #define DONT_REMEMBER_SIGNAL
 #endif
 
-/* Define void to stop lint from generating "null effekt" comments */
-#ifndef DONT_DEFINE_VOID
-#ifdef _lint
-int	__void__;
-#define VOID(X)		(__void__ = (int) (X))
-#else
-#undef VOID
-#define VOID(X)		(X)
-#endif
-#endif /* DONT_DEFINE_VOID */
+
 
 #if defined(_lint) || defined(FORCE_INIT_OF_VARS)
 #define LINT_INIT(var)	var=0			/* No uninitialize-warning */
===== libmysql/libmysql.c 1.302 vs edited =====
--- 1.302/libmysql/libmysql.c	2007-10-19 05:38:59 +02:00
+++ edited/libmysql/libmysql.c	2007-11-03 17:00:25 +01:00
@@ -869,7 +869,7 @@
   if ((*options->local_infile_init)(&li_ptr, net_filename,
     options->local_infile_userdata))
   {
-    VOID(my_net_write(net,(const uchar*) "",0)); /* Server needs one packet */
+    (void)my_net_write(net,(const uchar*) "",0); /* Server needs one packet */
     net_flush(net);
     strmov(net->sqlstate, unknown_sqlstate);
     net->last_errno= (*options->local_infile_error)(li_ptr,
===== mysys/hash.c 1.59 vs edited =====
--- 1.59/mysys/hash.c	2007-07-30 10:33:41 +02:00
+++ edited/mysys/hash.c	2007-11-03 17:00:29 +01:00
@@ -524,7 +524,7 @@
   pos->next=empty_index;
 
 exit:
-  VOID(pop_dynamic(&hash->array));
+  (void)pop_dynamic(&hash->array);
   if (hash->free)
     (*hash->free)((uchar*) record);
   DBUG_RETURN(0);
===== mysys/mf_iocache2.c 1.37 vs edited =====
--- 1.37/mysys/mf_iocache2.c	2007-08-08 18:20:59 +02:00
+++ edited/mysys/mf_iocache2.c	2007-11-03 17:00:33 +01:00
@@ -135,7 +135,7 @@
      b) see if there is a better way to make it work
   */
   if (info->type == SEQ_READ_APPEND)
-    VOID(flush_io_cache(info));
+    (void)flush_io_cache(info);
 
   offset=(pos - info->pos_in_file);
 
@@ -163,7 +163,7 @@
       info->write_pos = info->write_buffer + offset;
       DBUG_VOID_RETURN;
     }
-    VOID(flush_io_cache(info));
+    (void)flush_io_cache(info);
     /* Correct buffer end so that we write in increments of IO_SIZE */
     info->write_end=(info->write_buffer+info->buffer_length-
 		     (pos & (IO_SIZE-1)));
===== mysys/mf_keycache.c 1.76 vs edited =====
--- 1.76/mysys/mf_keycache.c	2007-10-18 18:50:25 +02:00
+++ edited/mysys/mf_keycache.c	2007-11-03 17:00:33 +01:00
@@ -4399,8 +4399,8 @@
   va_start(args,fmt);
   if (keycache_debug_log)
   {
-    VOID(vfprintf(keycache_debug_log, fmt, args));
-    VOID(fputc('\n',keycache_debug_log));
+    (void)vfprintf(keycache_debug_log, fmt, args);
+    (void)fputc('\n',keycache_debug_log);
   }
   va_end(args);
 }
===== mysys/mf_loadpath.c 1.11 vs edited =====
--- 1.11/mysys/mf_loadpath.c	2007-05-10 11:59:25 +02:00
+++ edited/mysys/mf_loadpath.c	2007-11-03 17:00:33 +01:00
@@ -34,7 +34,7 @@
 
   if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
       test_if_hard_path(path))
-    VOID(strmov(buff,path));
+    (void)strmov(buff,path);
   else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
 	   (is_prefix(path,FN_PARENTDIR)) ||
 	   ! own_path_prefix)
@@ -42,12 +42,12 @@
     if (is_cur)
       is_cur=2;					/* Remove current dir */
     if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
-      VOID(strcat(buff,path+is_cur));
+      (void)strcat(buff,path+is_cur);
     else
-      VOID(strmov(buff,path));			/* Return org file name */
+      (void)strmov(buff,path);			/* Return org file name */
   }
   else
-    VOID(strxmov(buff,own_path_prefix,path,NullS));
+    (void)strxmov(buff,own_path_prefix,path,NullS);
   strmov(to,buff);
   DBUG_PRINT("exit",("to: %s",to));
   DBUG_RETURN(to);
===== mysys/mf_path.c 1.14 vs edited =====
--- 1.14/mysys/mf_path.c	2007-07-30 10:33:42 +02:00
+++ edited/mysys/mf_path.c	2007-11-03 17:00:34 +01:00
@@ -42,7 +42,7 @@
 		   ((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 @@
       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);
===== mysys/my_append.c 1.9 vs edited =====
--- 1.9/mysys/my_append.c	2007-07-30 10:33:42 +02:00
+++ edited/mysys/my_append.c	2007-11-03 17:00:39 +01:00
@@ -58,7 +58,7 @@
     }
   }
 err:
-  if (from_file >= 0) VOID(my_close(from_file,MyFlags));
-  if (to_file >= 0)   VOID(my_close(to_file,MyFlags));
+  if (from_file >= 0) (void)my_close(from_file,MyFlags);
+  if (to_file >= 0)   (void)my_close(to_file,MyFlags);
   DBUG_RETURN(-1);
 }
===== mysys/my_clock.c 1.12 vs edited =====
--- 1.12/mysys/my_clock.c	2006-12-23 20:19:46 +01:00
+++ edited/mysys/my_clock.c	2007-11-03 17:00:40 +01:00
@@ -24,7 +24,7 @@
 {
 #if !defined(__WIN__) && !defined(__NETWARE__)
   struct tms tmsbuf;
-  VOID(times(&tmsbuf));
+  (void)times(&tmsbuf);
   return (tmsbuf.tms_utime + tmsbuf.tms_stime);
 #else
   return clock();
===== mysys/my_copy.c 1.20 vs edited =====
--- 1.20/mysys/my_copy.c	2007-07-30 10:33:42 +02:00
+++ edited/mysys/my_copy.c	2007-11-03 17:00:41 +01:00
@@ -94,9 +94,9 @@
 
     if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat)
 	DBUG_RETURN(0);			/* File copyed but not stat */
-    VOID(chmod(to, stat_buff.st_mode & 07777)); /* Copy modes */
+    (void)chmod(to, stat_buff.st_mode & 07777); /* Copy modes */
 #if !defined(__WIN__) && !defined(__NETWARE__)
-    VOID(chown(to, stat_buff.st_uid,stat_buff.st_gid)); /* Copy ownership */
+    (void)chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */
 #endif
 #if !defined(VMS) && !defined(__ZTC__)
     if (MyFlags & MY_COPYTIME)
@@ -104,19 +104,19 @@
       struct utimbuf timep;
       timep.actime  = stat_buff.st_atime;
       timep.modtime = stat_buff.st_mtime;
-      VOID(utime((char*) to, &timep)); /* last accessed and modified times */
+      (void)utime((char*) to, &timep); /* last accessed and modified times */
     }
 #endif
     DBUG_RETURN(0);
   }
 
 err:
-  if (from_file >= 0) VOID(my_close(from_file,MyFlags));
+  if (from_file >= 0) (void)my_close(from_file,MyFlags);
   if (to_file >= 0)
   {
-    VOID(my_close(to_file, MyFlags));
+    (void)my_close(to_file, MyFlags);
     /* attempt to delete the to-file we've partially written */
-    VOID(my_delete(to, MyFlags));
+    (void)my_delete(to, MyFlags);
   }
   DBUG_RETURN(-1);
 } /* my_copy */
===== mysys/my_fstream.c 1.12 vs edited =====
--- 1.12/mysys/my_fstream.c	2007-05-10 11:59:25 +02:00
+++ edited/mysys/my_fstream.c	2007-11-03 17:00:43 +01:00
@@ -119,7 +119,7 @@
 #ifdef EINTR
       if (errno == EINTR)
       {
-	VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
+	(void)my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
 	continue;
       }
 #endif
@@ -134,8 +134,8 @@
         if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
           my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
                    "[stream]",my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
-        VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
-        VOID(my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0)));
+        (void)sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
+        (void)my_fseek(stream,seekptr,MY_SEEK_SET,MYF(0));
         continue;
       }
 #endif
===== mysys/my_getwd.c 1.23 vs edited =====
--- 1.23/mysys/my_getwd.c	2007-05-10 11:59:25 +02:00
+++ edited/mysys/my_getwd.c	2007-11-03 17:00:44 +01:00
@@ -51,7 +51,7 @@
                    (long) buf, (uint) size, MyFlags));
 
   if (curr_dir[0])				/* Current pos is saved here */
-    VOID(strmake(buf,&curr_dir[0],size-1));
+    (void)strmake(buf,&curr_dir[0],size-1);
   else
   {
 #if defined(HAVE_GETCWD)
===== mysys/my_lib.c 1.31 vs edited =====
--- 1.31/mysys/my_lib.c	2007-05-10 11:59:25 +02:00
+++ edited/mysys/my_lib.c	2007-11-03 17:00:45 +01:00
@@ -160,8 +160,8 @@
         goto error;
       
       bzero(finfo.mystat, sizeof(MY_STAT));
-      VOID(strmov(tmp_file,dp->d_name));
-      VOID(my_stat(tmp_path, finfo.mystat, MyFlags));
+      (void)strmov(tmp_file,dp->d_name);
+      (void)my_stat(tmp_path, finfo.mystat, MyFlags);
       if (!(finfo.mystat->st_mode & MY_S_IREAD))
         continue;
     }
@@ -267,7 +267,7 @@
 	/* what about when we have logical_name:???? */
       if (src[slen] == FN_DEVCHAR)
       {				/* Xlate logical name and see what we get */
-	VOID(strmov(dst,src));
+	(void)strmov(dst,src);
 	dst[slen] = 0;				/* remove colon */
 	if (!(src = getenv (dst)))
 	  return dst;				/* Can't translate */
@@ -283,13 +283,13 @@
 	slen = strlen (src) - 1;
 	if (src[slen] != FN_C_AFTER_DIR && src[slen] != FN_C_AFTER_DIR_2)
 	{					/* no recursion here! */
-	  VOID(strmov(dst, src));
+	  (void)strmov(dst, src);
 	  return(dst);
 	}
       }
       else
       {						/* not a directory spec */
-	VOID(strmov(dst, src));
+	(void)strmov(dst, src);
 	return(dst);
       }
     }
@@ -297,13 +297,13 @@
     bracket = src[slen];			/* End char */
     if (!(ptr = strchr (src, bracket - 2)))
     {						/* no opening bracket */
-      VOID(strmov (dst, src));
+      (void)strmov (dst, src);
       return dst;
     }
     if (!(rptr = strrchr (src, '.')))
       rptr = ptr;
     slen = rptr - src;
-    VOID(strmake (dst, src, slen));
+    (void)strmake (dst, src, slen);
 
     if (*rptr == '.')
     {						/* Put bracket and add */
@@ -324,7 +324,7 @@
 	    && (ptr[rlen] == FN_C_AFTER_DIR || ptr[rlen] == FN_C_AFTER_DIR_2)
 	    && ptr[rlen - 1] == '.')
 	{
-	  VOID(strmov(esa,ptr));
+	  (void)strmov(esa,ptr);
 	  esa[rlen - 1] = FN_C_AFTER_DIR;
 	  esa[rlen] = '\0';
 	  return (directory_file_name (dst, esa));
@@ -332,13 +332,13 @@
 	else
 	  dst[slen - 1] = ':';
       }
-      VOID(strmov(dst+slen,"[000000]"));
+      (void)strmov(dst+slen,"[000000]");
       slen += 8;
     }
-    VOID(strmov(strmov(dst+slen,rptr+1)-1,".DIR.1"));
+    (void)strmov(strmov(dst+slen,rptr+1)-1,".DIR.1");
     return dst;
   }
-  VOID(strmov(dst, src));
+  (void)strmov(dst, src);
   if (dst[slen] == '/' && slen > 1)
     dst[slen] = 0;
   return dst;
===== mysys/my_lockmem.c 1.6 vs edited =====
--- 1.6/mysys/my_lockmem.c	2007-05-10 11:59:25 +02:00
+++ edited/mysys/my_lockmem.c	2007-11-03 17:00:46 +01:00
@@ -59,7 +59,7 @@
     /* Add block in a list for munlock */
     if (!(element=(struct st_mem_list*) my_malloc(sizeof(*element),MyFlags)))
     {
-      VOID(munlock((uchar*) ptr,size));
+      (void)munlock((uchar*) ptr,size);
       free(ptr);
       DBUG_RETURN(0);
     }
@@ -85,7 +85,7 @@
     element=(struct st_mem_list*) list->data;
     if (ptr == element->page)
     {						/* Found locked mem */
-      VOID(munlock((uchar*) ptr,element->size));
+      (void)munlock((uchar*) ptr,element->size);
       mem_list=list_delete(mem_list,list);
       break;
     }
===== mysys/my_pread.c 1.21 vs edited =====
--- 1.21/mysys/my_pread.c	2007-05-31 16:45:16 +02:00
+++ edited/mysys/my_pread.c	2007-11-03 17:00:49 +01:00
@@ -164,7 +164,7 @@
       if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
 	my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
 		 my_filename(Filedes),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
-      VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
+      (void)sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
       continue;
     }
     if ((writenbytes && writenbytes != (size_t) -1) || my_errno == EINTR)
===== mysys/my_pthread.c 1.59 vs edited =====
--- 1.59/mysys/my_pthread.c	2007-07-30 21:42:51 +02:00
+++ edited/mysys/my_pthread.c	2007-11-03 17:00:49 +01:00
@@ -38,7 +38,7 @@
   struct sched_param tmp_sched_param;
   bzero((char*) &tmp_sched_param,sizeof(tmp_sched_param));
   tmp_sched_param.sched_priority=prior;
-  VOID(pthread_setschedparam(thread_id,SCHED_POLICY,&tmp_sched_param));
+  (void)pthread_setschedparam(thread_id,SCHED_POLICY,&tmp_sched_param);
 #endif
 }
 #endif
@@ -65,7 +65,7 @@
   struct sched_param tmp_sched_param;
   bzero((char*) &tmp_sched_param,sizeof(tmp_sched_param));
   tmp_sched_param.sched_priority=priority;
-  VOID(pthread_attr_setschedparam(attr,&tmp_sched_param));
+  (void)pthread_attr_setschedparam(attr,&tmp_sched_param);
 #endif
 }
 #endif
@@ -308,7 +308,7 @@
 {
   pthread_mutex_lock(&LOCK_sigwait);
   sigaddset(&pending_set, sig);
-  VOID(pthread_cond_signal(&COND_sigwait)); /* inform sigwait() about signal */
+  (void)pthread_cond_signal(&COND_sigwait); /* inform sigwait() about signal */
   pthread_mutex_unlock(&LOCK_sigwait);
 }
 
@@ -365,8 +365,8 @@
     pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
     pthread_attr_setstacksize(&thr_attr,8196);
     my_pthread_attr_setprio(&thr_attr,100);	/* Very high priority */
-    VOID(pthread_create(&sigwait_thread_id,&thr_attr,sigwait_thread,setp));
-    VOID(pthread_attr_destroy(&thr_attr));
+    (void)pthread_create(&sigwait_thread_id,&thr_attr,sigwait_thread,setp);
+    (void)pthread_attr_destroy(&thr_attr);
   }
 
   pthread_mutex_lock(&LOCK_sigwait);
@@ -392,7 +392,7 @@
 	return 0;
       }
     }
-    VOID(pthread_cond_wait(&COND_sigwait,&LOCK_sigwait));
+    (void)pthread_cond_wait(&COND_sigwait,&LOCK_sigwait);
   }
   return 0;
 }
===== mysys/my_redel.c 1.15 vs edited =====
--- 1.15/mysys/my_redel.c	2007-03-29 19:01:47 +02:00
+++ edited/mysys/my_redel.c	2007-11-03 17:00:50 +01:00
@@ -86,7 +86,7 @@
   }
   if ((statbuf.st_mode & S_IFMT) != S_IFREG)
     return 1;
-  VOID(chmod(to, statbuf.st_mode & 07777));		/* Copy modes */
+  (void)chmod(to, statbuf.st_mode & 07777);		/* Copy modes */
 
 #if !defined(__WIN__) && !defined(__NETWARE__)
   if (statbuf.st_nlink > 1 && MyFlags & MY_LINK_WARNING)
@@ -94,7 +94,7 @@
     if (MyFlags & MY_LINK_WARNING)
       my_error(EE_LINK_WARNING,MYF(ME_BELL+ME_WAITTANG),from,statbuf.st_nlink);
   }
-  VOID(chown(to, statbuf.st_uid, statbuf.st_gid));	/* Copy ownership */
+  (void)chown(to, statbuf.st_uid, statbuf.st_gid);	/* Copy ownership */
 #endif /* !__WIN__ && !__NETWARE__ */
 
 #ifndef VMS
@@ -104,7 +104,7 @@
     struct utimbuf timep;
     timep.actime  = statbuf.st_atime;
     timep.modtime = statbuf.st_mtime;
-    VOID(utime((char*) to, &timep));/* Update last accessed and modified times */
+    (void)utime((char*) to, &timep);/* Update last accessed and modified times */
   }
 #else
   if (MyFlags & MY_COPYTIME)
@@ -112,7 +112,7 @@
     time_t time[2];
     time[0]= statbuf.st_atime;
     time[1]= statbuf.st_mtime;
-    VOID(utime((char*) to, time));/* Update last accessed and modified times */
+    (void)utime((char*) to, time);/* Update last accessed and modified times */
   }
 #endif
 #endif
===== mysys/my_winthread.c 1.16 vs edited =====
--- 1.16/mysys/my_winthread.c	2007-10-18 16:39:54 +02:00
+++ edited/mysys/my_winthread.c	2007-11-03 02:21:46 +01:00
@@ -129,7 +129,7 @@
 	       ("Can't create thread to handle request (error %d)",error));
     DBUG_RETURN(error ? error : -1);
   }
-  VOID(SetThreadPriority(hThread, priority)) ;
+  (void)(SetThreadPriority(hThread, priority)) ;
   DBUG_RETURN(0);
 }
 
===== mysys/my_write.c 1.16 vs edited =====
--- 1.16/mysys/my_write.c	2007-05-10 11:59:26 +02:00
+++ edited/mysys/my_write.c	2007-11-03 17:00:53 +01:00
@@ -53,7 +53,7 @@
       if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
 	my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
 		 my_filename(Filedes),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
-      VOID(sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC));
+      (void)sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
       continue;
     }
 
===== mysys/thr_alarm.c 1.65 vs edited =====
--- 1.65/mysys/thr_alarm.c	2007-08-13 15:11:10 +02:00
+++ edited/mysys/thr_alarm.c	2007-11-03 17:00:56 +01:00
@@ -99,8 +99,8 @@
     pthread_attr_setstacksize(&thr_attr,8196);
 
     my_pthread_attr_setprio(&thr_attr,100);	/* Very high priority */
-    VOID(pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL));
-    VOID(pthread_attr_destroy(&thr_attr));
+    (void)pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL);
+    (void)pthread_attr_destroy(&thr_attr);
   }
 #elif defined(USE_ONE_SIGNAL_HAND)
   pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
@@ -774,7 +774,7 @@
 		break;
 	      continue;
 	    }
-	    VOID(getchar());			/* Somebody was playing */
+	    (void)getchar();			/* Somebody was playing */
 	  }
 	}
       }
@@ -786,7 +786,7 @@
   }
   pthread_mutex_lock(&LOCK_thread_count);
   thread_count--;
-  VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+  (void)pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
   pthread_mutex_unlock(&LOCK_thread_count);
   free((uchar*) arg);
   return 0;
@@ -815,7 +815,7 @@
   pthread_detach_this_thread();
   init_thr_alarm(10);				/* Setup alarm handler */
   pthread_mutex_lock(&LOCK_thread_count);	/* Required by bsdi */
-  VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+  (void)pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
   pthread_mutex_unlock(&LOCK_thread_count);
 
   sigemptyset(&set);				/* Catch all signals */
@@ -906,7 +906,7 @@
 #ifdef NOT_USED
   sigemptyset(&set);
   sigaddset(&set, thr_client_alarm);
-  VOID(pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0));
+  (void)pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0);
 #endif
 
   pthread_attr_init(&thr_attr);
@@ -915,10 +915,10 @@
   pthread_attr_setstacksize(&thr_attr,65536L);
 
   /* Start signal thread and wait for it to start */
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)pthread_mutex_lock(&LOCK_thread_count);
   pthread_create(&tid,&thr_attr,signal_hand,NULL);
-  VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
+  (void)pthread_mutex_unlock(&LOCK_thread_count);
   DBUG_PRINT("info",("signal thread created"));
 
   thr_setconcurrency(3);
@@ -946,7 +946,7 @@
 	 alarm_info.next_alarm_time);
   while (thread_count)
   {
-    VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
+    (void)pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);
     if (thread_count == 1)
     {
       printf("Calling end_thr_alarm. This should cancel the last thread\n");
===== mysys/thr_lock.c 1.61 vs edited =====
--- 1.61/mysys/thr_lock.c	2007-08-05 11:20:03 +02:00
+++ edited/mysys/thr_lock.c	2007-11-03 17:00:57 +01:00
@@ -316,7 +316,7 @@
 {
   DBUG_ENTER("thr_lock_init");
   bzero((char*) lock,sizeof(*lock));
-  VOID(pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST));
+  (void)pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST);
   lock->read.last= &lock->read.data;
   lock->read_wait.last= &lock->read_wait.data;
   lock->write_wait.last= &lock->write_wait.data;
@@ -333,7 +333,7 @@
 void thr_lock_delete(THR_LOCK *lock)
 {
   DBUG_ENTER("thr_lock_delete");
-  VOID(pthread_mutex_destroy(&lock->mutex));
+  (void)pthread_mutex_destroy(&lock->mutex);
   pthread_mutex_lock(&THR_LOCK_lock);
   thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);
   pthread_mutex_unlock(&THR_LOCK_lock);
@@ -489,7 +489,7 @@
   data->cond=0;					/* safety */
   data->type=lock_type;
   data->owner= owner;                           /* Must be reset ! */
-  VOID(pthread_mutex_lock(&lock->mutex));
+  (void)pthread_mutex_lock(&lock->mutex);
   DBUG_PRINT("lock",("data: 0x%lx  thread: 0x%lx  lock: 0x%lx  type: %d",
                      (long) data, data->owner->info->thread_id,
                      (long) lock, (int) lock_type));
@@ -736,7 +736,7 @@
 		       data->owner->info->thread_id));
     /* purecov: end */
     data->cond=0;				/* Mark thread free */
-    VOID(pthread_cond_signal(cond));
+    (void)pthread_cond_signal(cond);
   } while ((data=data->next));
   *lock->read_wait.last=0;
   if (!lock->read_wait.data)
@@ -846,7 +846,7 @@
 	  {
 	    pthread_cond_t *cond=data->cond;
 	    data->cond=0;				/* Mark thread free */
-	    VOID(pthread_cond_signal(cond));	/* Start waiting thread */
+	    (void)pthread_cond_signal(cond);	/* Start waiting thread */
 	  }
 	  if (data->type != TL_WRITE_ALLOW_WRITE ||
 	      !lock->write_wait.data ||
@@ -897,7 +897,7 @@
 	lock->write.last= &data->next;
 	data->next=0;				/* Only one write lock */
 	data->cond=0;				/* Mark thread free */
-	VOID(pthread_cond_signal(cond));	/* Start waiting thread */
+	(void)pthread_cond_signal(cond);	/* Start waiting thread */
       } while (lock_type == TL_WRITE_ALLOW_WRITE &&
 	       (data=lock->write_wait.data) &&
 	       data->type == TL_WRITE_ALLOW_WRITE);
@@ -1464,7 +1464,7 @@
        list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
-    VOID(pthread_mutex_lock(&lock->mutex));
+    (void)pthread_mutex_lock(&lock->mutex);
     printf("lock: 0x%lx:",(ulong) lock);
     if ((lock->write_wait.data || lock->read_wait.data) &&
 	(! lock->read.data && ! lock->write.data))
@@ -1482,7 +1482,7 @@
     thr_print_lock("write_wait",&lock->write_wait);
     thr_print_lock("read",&lock->read);
     thr_print_lock("read_wait",&lock->read_wait);
-    VOID(pthread_mutex_unlock(&lock->mutex));
+    (void)pthread_mutex_unlock(&lock->mutex);
     puts("");
   }
   fflush(stdout);
@@ -1622,7 +1622,7 @@
   thr_print_locks();
   pthread_mutex_lock(&LOCK_thread_count);
   thread_count--;
-  VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
+  (void)pthread_cond_signal(&COND_thread_count); /* Tell main we are ready */
   pthread_mutex_unlock(&LOCK_thread_count);
   free((uchar*) arg);
   return 0;
@@ -1683,7 +1683,7 @@
   }
 #endif
 #ifdef HAVE_THR_SETCONCURRENCY
-  VOID(thr_setconcurrency(2));
+  (void)thr_setconcurrency(2);
 #endif
   for (i=0 ; i < (int) array_elements(lock_counts) ; i++)
   {
===== sql/derror.cc 1.25 vs edited =====
--- 1.25/sql/derror.cc	2007-05-24 00:39:17 +02:00
+++ edited/sql/derror.cc	2007-11-03 02:21:58 +01:00
@@ -128,7 +128,7 @@
 but it should contain at least %d error messages.\n\
 Check that the above file is the right version for this program!",
 		    name,count,error_messages);
-    VOID(my_close(file,MYF(MY_WME)));
+    (void)(my_close(file,MYF(MY_WME)));
     DBUG_RETURN(1);
   }
 
@@ -155,7 +155,7 @@
   {
     point[i]= *point +uint2korr(head+10+i+i);
   }
-  VOID(my_close(file,MYF(0)));
+  (void)(my_close(file,MYF(0)));
   DBUG_RETURN(0);
 
 err:
@@ -173,7 +173,7 @@
   sql_print_error(errmsg, name);
 err1:
   if (file != FERR)
-    VOID(my_close(file,MYF(MY_WME)));
+    (void)(my_close(file,MYF(MY_WME)));
   DBUG_RETURN(1);
 } /* read_texts */
 
===== sql/des_key_file.cc 1.15 vs edited =====
--- 1.15/sql/des_key_file.cc	2006-12-30 21:02:06 +01:00
+++ edited/sql/des_key_file.cc	2007-11-03 02:21:58 +01:00
@@ -42,7 +42,7 @@
   DBUG_ENTER("load_des_key_file");
   DBUG_PRINT("enter",("name: %s",file_name));
 
-  VOID(pthread_mutex_lock(&LOCK_des_key_file));
+  (void)(pthread_mutex_lock(&LOCK_des_key_file));
   if ((file=my_open(file_name,O_RDONLY | O_BINARY ,MYF(MY_WME))) < 0 ||
       init_io_cache(&io, file, IO_SIZE*2, READ_CACHE, 0, 0, MYF(MY_WME)))
     goto error;
@@ -95,7 +95,7 @@
     my_close(file,MYF(0));
     end_io_cache(&io);
   }
-  VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+  (void)(pthread_mutex_unlock(&LOCK_des_key_file));
   DBUG_RETURN(result);
 }
 #endif /* HAVE_OPENSSL */
===== sql/discover.cc 1.8 vs edited =====
--- 1.8/sql/discover.cc	2007-05-10 11:59:26 +02:00
+++ edited/sql/discover.cc	2007-11-03 02:21:58 +01:00
@@ -78,7 +78,7 @@
   
  err:
   if (file > 0)
-    VOID(my_close(file,MYF(MY_WME)));
+    (void)(my_close(file,MYF(MY_WME)));
   
  err_end:		      /* Here when no file */
   DBUG_RETURN (error);
@@ -116,7 +116,7 @@
   {
     if (my_write(file, frmdata, len,MYF(MY_WME | MY_NABP)))
       error= 2;
-    VOID(my_close(file,MYF(0)));
+    (void)(my_close(file,MYF(0)));
   }
   DBUG_RETURN(error);
 } /* writefrm */
===== sql/field.cc 1.420 vs edited =====
--- 1.420/sql/field.cc	2007-10-19 01:14:25 +02:00
+++ edited/sql/field.cc	2007-11-03 02:21:58 +01:00
@@ -4056,7 +4056,7 @@
     char buff[70],*pos=buff;
     int decpt,sign,tmp_dec=dec;
 
-    VOID(sfconvert(&nr,tmp_dec,&decpt,&sign,buff));
+    (void)(sfconvert(&nr,tmp_dec,&decpt,&sign,buff));
     if (sign)
     {
       *to++='-';
@@ -4414,7 +4414,7 @@
     char *pos= buff;
     int decpt,sign,tmp_dec=dec;
 
-    VOID(fconvert(nr,tmp_dec,&decpt,&sign,buff));
+    (void)(fconvert(nr,tmp_dec,&decpt,&sign,buff));
     if (sign)
     {
       *to++='-';
===== sql/filesort.cc 1.136 vs edited =====
--- 1.136/sql/filesort.cc	2007-09-21 09:07:01 +02:00
+++ edited/sql/filesort.cc	2007-11-03 02:21:58 +01:00
@@ -1253,7 +1253,7 @@
         if (!(error= (int) read_to_buffer(from_file,buffpek,
                                           rec_length)))
         {
-          VOID(queue_remove(&queue,0));
+          (void)(queue_remove(&queue,0));
           reuse_freed_buff(&queue, buffpek, rec_length);
           break;                        /* One buffer have been removed */
         }
===== sql/ha_partition.cc 1.110 vs edited =====
--- 1.110/sql/ha_partition.cc	2007-10-10 23:35:21 +02:00
+++ edited/sql/ha_partition.cc	2007-11-03 02:21:59 +01:00
@@ -640,7 +640,7 @@
         part_elem->part_state= PART_IS_DROPPED;
     }
   } while (++i < no_parts);
-  VOID(sync_ddl_log());
+  (void)(sync_ddl_log());
   DBUG_RETURN(error);
 }
 
@@ -730,7 +730,7 @@
           part_elem->log_entry= NULL; /* Indicate success */
       }
     } while (++i < temp_partitions);
-    VOID(sync_ddl_log());
+    (void)(sync_ddl_log());
   }
   i= 0;
   do
@@ -782,7 +782,7 @@
               error= ret_error;
             else if (deactivate_ddl_log_entry(sub_elem->log_entry->entry_pos))
               error= 1;
-            VOID(sync_ddl_log());
+            (void)(sync_ddl_log());
           }
           file= m_new_file[part];
           create_subpartition_name(part_name_buff, path,
@@ -813,7 +813,7 @@
             error= ret_error;
           else if (deactivate_ddl_log_entry(part_elem->log_entry->entry_pos))
             error= 1;
-          VOID(sync_ddl_log());
+          (void)(sync_ddl_log());
         }
         file= m_new_file[i];
         create_partition_name(part_name_buff, path,
@@ -831,7 +831,7 @@
       }
     }
   } while (++i < no_parts);
-  VOID(sync_ddl_log());
+  (void)(sync_ddl_log());
   DBUG_RETURN(error);
 }
 
@@ -1156,7 +1156,7 @@
   DBUG_RETURN(0);
 error:
   if (create_flag)
-    VOID(file->delete_table(part_name));
+    (void)(file->delete_table(part_name));
   DBUG_RETURN(error);
 }
 
@@ -1709,7 +1709,7 @@
   {
     create_partition_name(from_buff, from, name_buffer_ptr, NORMAL_PART_NAME,
                           FALSE);
-    VOID((*file)->delete_table((const char*) from_buff));
+    (void)((*file)->delete_table((const char*) from_buff));
     name_buffer_ptr= strend(name_buffer_ptr) + 1;
   }
   DBUG_RETURN(error);
@@ -1982,7 +1982,7 @@
   {
     result= my_write(file, (uchar *) file_buffer, tot_len_byte,
                      MYF(MY_WME | MY_NABP)) != 0;
-    VOID(my_close(file, MYF(0)));
+    (void)(my_close(file, MYF(0)));
   }
   else
     result= TRUE;
@@ -2168,7 +2168,7 @@
   len_bytes= 4 * len_words;
   if (!(file_buffer= (char*) my_malloc(len_bytes, MYF(0))))
     goto err1;
-  VOID(my_seek(file, 0, MY_SEEK_SET, MYF(0)));
+  (void)(my_seek(file, 0, MY_SEEK_SET, MYF(0)));
   if (my_read(file, (uchar *) file_buffer, len_bytes, MYF(MY_NABP)))
     goto err2;
 
@@ -2190,7 +2190,7 @@
   if (len_words != (tot_partition_words + tot_name_words + 4))
     goto err3;
   name_buffer_ptr= file_buffer + 16 + 4 * tot_partition_words;
-  VOID(my_close(file, MYF(0)));
+  (void)(my_close(file, MYF(0)));
   m_file_buffer= file_buffer;          // Will be freed in clear_handler_file()
   m_name_buffer_ptr= name_buffer_ptr;
   
@@ -2215,7 +2215,7 @@
 err2:
   my_free(file_buffer, MYF(0));
 err1:
-  VOID(my_close(file, MYF(0)));
+  (void)(my_close(file, MYF(0)));
   DBUG_RETURN(TRUE);
 }
 
@@ -5098,9 +5098,9 @@
     DBUG_VOID_RETURN;
   file= m_file[partition_id];
   if (m_extra_cache_size == 0)
-    VOID(file->extra(HA_EXTRA_CACHE));
+    (void)(file->extra(HA_EXTRA_CACHE));
   else
-    VOID(file->extra_opt(HA_EXTRA_CACHE, m_extra_cache_size));
+    (void)(file->extra_opt(HA_EXTRA_CACHE, m_extra_cache_size));
   DBUG_VOID_RETURN;
 }
 
@@ -5124,7 +5124,7 @@
   if (!m_extra_cache)
     DBUG_VOID_RETURN;
   file= m_file[partition_id];
-  VOID(file->extra(HA_EXTRA_NO_CACHE));
+  (void)(file->extra(HA_EXTRA_NO_CACHE));
   DBUG_VOID_RETURN;
 }
 
@@ -5780,7 +5780,7 @@
     if (!partition_init)
     {
       partition_init++;
-      VOID(pthread_mutex_init(&partition_mutex, MY_MUTEX_INIT_FAST));
+      (void)(pthread_mutex_init(&partition_mutex, MY_MUTEX_INIT_FAST));
       (void) hash_init(&partition_open_tables, system_charset_info, 32, 0, 0,
 		       (hash_get_key) partition_get_key, 0, 0);
     }
===== sql/handler.cc 1.254 vs edited =====
--- 1.254/sql/handler.cc	2007-09-27 22:36:56 +02:00
+++ edited/sql/handler.cc	2007-11-03 02:21:59 +01:00
@@ -2401,7 +2401,7 @@
   }
 err:
   if (file >= 0)
-    VOID(my_close(file,MYF(MY_WME)));
+    (void)(my_close(file,MYF(MY_WME)));
   DBUG_RETURN(result);
 }
 
@@ -2634,7 +2634,7 @@
   name= check_lowercase_names(table.file, share.path.str, name_buff);
 
   error= table.file->create(name, &table, create_info);
-  VOID(closefrm(&table, 0));
+  (void)(closefrm(&table, 0));
   if (error)
   {
     strxmov(name_buff, db, ".", table_name, NullS);
@@ -2705,7 +2705,7 @@
 
   check_lowercase_names(table.file, path, path);
   error=table.file->create(path,&table,&create_info);
-  VOID(closefrm(&table, 1));
+  (void)(closefrm(&table, 1));
 
   DBUG_RETURN(error != 0);
 }
===== sql/hostname.cc 1.38 vs edited =====
--- 1.38/sql/hostname.cc	2007-05-10 11:59:27 +02:00
+++ edited/sql/hostname.cc	2007-11-03 02:21:59 +01:00
@@ -82,7 +82,7 @@
 {
   if (!(specialflag & SPECIAL_NO_HOST_CACHE))
   {
-    VOID(pthread_mutex_lock(&hostname_cache->lock));
+    (void)(pthread_mutex_lock(&hostname_cache->lock));
     host_entry *entry;
     if (!(entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
     {
@@ -101,7 +101,7 @@
 	(void) hostname_cache->add(entry);
       }
     }
-    VOID(pthread_mutex_unlock(&hostname_cache->lock));
+    (void)(pthread_mutex_unlock(&hostname_cache->lock));
   }
 }
 
@@ -113,20 +113,20 @@
 
 void inc_host_errors(struct in_addr *in)
 {
-  VOID(pthread_mutex_lock(&hostname_cache->lock));
+  (void)(pthread_mutex_lock(&hostname_cache->lock));
   host_entry *entry;
   if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
     entry->errors++;
-  VOID(pthread_mutex_unlock(&hostname_cache->lock));
+  (void)(pthread_mutex_unlock(&hostname_cache->lock));
 }
 
 void reset_host_errors(struct in_addr *in)
 {
-  VOID(pthread_mutex_lock(&hostname_cache->lock));
+  (void)(pthread_mutex_lock(&hostname_cache->lock));
   host_entry *entry;
   if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
     entry->errors=0;
-  VOID(pthread_mutex_unlock(&hostname_cache->lock));
+  (void)(pthread_mutex_unlock(&hostname_cache->lock));
 }
 
 /* Deal with systems that don't defined INADDR_LOOPBACK */
@@ -148,7 +148,7 @@
   /* Check first if we have name in cache */
   if (!(specialflag & SPECIAL_NO_HOST_CACHE))
   {
-    VOID(pthread_mutex_lock(&hostname_cache->lock));
+    (void)(pthread_mutex_lock(&hostname_cache->lock));
     if ((entry=(host_entry*) hostname_cache->search((uchar*) &in->s_addr,0)))
     {
       char *name;
@@ -157,10 +157,10 @@
       else
 	name=my_strdup(entry->hostname,MYF(0));
       *errors= entry->errors;
-      VOID(pthread_mutex_unlock(&hostname_cache->lock));
+      (void)(pthread_mutex_unlock(&hostname_cache->lock));
       DBUG_RETURN(name);
     }
-    VOID(pthread_mutex_unlock(&hostname_cache->lock));
+    (void)(pthread_mutex_unlock(&hostname_cache->lock));
   }
 
   struct hostent *hp, *check;
@@ -209,10 +209,10 @@
   }
   my_gethostbyname_r_free();
 #else
-  VOID(pthread_mutex_lock(&LOCK_hostname));
+  (void)(pthread_mutex_lock(&LOCK_hostname));
   if (!(hp=gethostbyaddr((char*) in,sizeof(*in), AF_INET)))
   {
-    VOID(pthread_mutex_unlock(&LOCK_hostname));
+    (void)(pthread_mutex_unlock(&LOCK_hostname));
     DBUG_PRINT("error",("gethostbyaddr returned %d",errno));
 
     if (errno == HOST_NOT_FOUND || errno == NO_DATA)
@@ -222,17 +222,17 @@
   }
   if (!hp->h_name[0])				// Don't allow empty hostnames
   {
-    VOID(pthread_mutex_unlock(&LOCK_hostname));
+    (void)(pthread_mutex_unlock(&LOCK_hostname));
     DBUG_PRINT("error",("Got an empty hostname"));
     goto add_wrong_ip_and_return;
   }
   if (!(name=my_strdup(hp->h_name,MYF(0))))
   {
-    VOID(pthread_mutex_unlock(&LOCK_hostname));
+    (void)(pthread_mutex_unlock(&LOCK_hostname));
     DBUG_RETURN(0);				// out of memory
   }
   check=gethostbyname(name);
-  VOID(pthread_mutex_unlock(&LOCK_hostname));
+  (void)(pthread_mutex_unlock(&LOCK_hostname));
   if (!check)
   {
     DBUG_PRINT("error",("gethostbyname returned %d",errno));
===== sql/init.cc 1.21 vs edited =====
--- 1.21/sql/init.cc	2007-05-28 10:49:39 +02:00
+++ edited/sql/init.cc	2007-11-03 02:21:59 +01:00
@@ -35,7 +35,7 @@
   my_abort_hook=unireg_abort;		/* Abort with close of databases */
 #endif
 
-  VOID(strmov(reg_ext,".frm"));
+  (void)(strmov(reg_ext,".frm"));
   reg_ext_length= 4;
   specialflag=SPECIAL_SAME_DB_NAME | options;  /* Set options from argv */
   DBUG_VOID_RETURN;
===== sql/item.cc 1.209 vs edited =====
--- 1.209/sql/item.cc	2007-10-19 05:38:59 +02:00
+++ edited/sql/item.cc	2007-11-03 02:21:59 +01:00
@@ -1186,7 +1186,7 @@
 {
   if (str->reserve(MAX_INT_WIDTH + sizeof("case_expr@")))
     return;                                    /* purecov: inspected */
-  VOID(str->append(STRING_WITH_LEN("case_expr@")));
+  (void)(str->append(STRING_WITH_LEN("case_expr@")));
   str->qs_append(m_case_expr_id);
 }
 
===== sql/item_cmpfunc.cc 1.288 vs edited =====
--- 1.288/sql/item_cmpfunc.cc	2007-08-26 13:31:12 +02:00
+++ edited/sql/item_cmpfunc.cc	2007-11-03 02:21:59 +01:00
@@ -4108,7 +4108,7 @@
       if (!(new_item= new Item_func_not(item)))
 	return;					// Fatal OEM error
     }
-    VOID(li.replace(new_item));
+    (void)(li.replace(new_item));
   }
 }
 
===== sql/item_strfunc.cc 1.329 vs edited =====
--- 1.329/sql/item_strfunc.cc	2007-08-26 13:31:13 +02:00
+++ edited/sql/item_strfunc.cc	2007-11-03 02:21:59 +01:00
@@ -459,18 +459,18 @@
   if (arg_count == 1)
   {
     /* Protect against someone doing FLUSH DES_KEY_FILE */
-    VOID(pthread_mutex_lock(&LOCK_des_key_file));
+    (void)(pthread_mutex_lock(&LOCK_des_key_file));
     keyschedule= des_keyschedule[key_number=des_default_key];
-    VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+    (void)(pthread_mutex_unlock(&LOCK_des_key_file));
   }
   else if (args[1]->result_type() == INT_RESULT)
   {
     key_number= (uint) args[1]->val_int();
     if (key_number > 9)
       goto error;
-    VOID(pthread_mutex_lock(&LOCK_des_key_file));
+    (void)(pthread_mutex_lock(&LOCK_des_key_file));
     keyschedule= des_keyschedule[key_number];
-    VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+    (void)(pthread_mutex_unlock(&LOCK_des_key_file));
   }
   else
   {
@@ -556,9 +556,9 @@
         key_number > 9)
       goto error;
 
-    VOID(pthread_mutex_lock(&LOCK_des_key_file));
+    (void)(pthread_mutex_lock(&LOCK_des_key_file));
     keyschedule= des_keyschedule[key_number];
-    VOID(pthread_mutex_unlock(&LOCK_des_key_file));
+    (void)(pthread_mutex_unlock(&LOCK_des_key_file));
   }
   else
   {
===== sql/lock.cc 1.112 vs edited =====
--- 1.112/sql/lock.cc	2007-10-03 02:27:23 +02:00
+++ edited/sql/lock.cc	2007-11-03 02:22:00 +01:00
@@ -307,7 +307,7 @@
     if (rc > 1)                                 /* a timeout or a deadlock */
     {
       if (sql_lock->table_count)
-        VOID(unlock_external(thd, sql_lock->table, sql_lock->table_count));
+        (void)(unlock_external(thd, sql_lock->table, sql_lock->table_count));
       reset_lock_data_and_free(&sql_lock);
       my_error(rc, MYF(0));
       break;
@@ -339,7 +339,7 @@
         thr_multi_unlock(sql_lock->locks, sql_lock->lock_count);
 
     if (sql_lock->table_count)
-      VOID(unlock_external(thd, sql_lock->table, sql_lock->table_count));
+      (void)(unlock_external(thd, sql_lock->table, sql_lock->table_count));
 
     /*
       If thr_multi_lock fails it resets lock type for tables, which
@@ -415,7 +415,7 @@
   if (sql_lock->lock_count)
     thr_multi_unlock(sql_lock->locks,sql_lock->lock_count);
   if (sql_lock->table_count)
-    VOID(unlock_external(thd,sql_lock->table,sql_lock->table_count));
+    (void)(unlock_external(thd,sql_lock->table,sql_lock->table_count));
   my_free((uchar*) sql_lock,MYF(0));
   DBUG_VOID_RETURN;
 }
@@ -478,7 +478,7 @@
   /* Unlock all read locked tables */
   if (i != found)
   {
-    VOID(unlock_external(thd,table,i-found));
+    (void)(unlock_external(thd,table,i-found));
     sql_lock->table_count=found;
   }
   /* Fix the lock positions in TABLE */
@@ -952,7 +952,7 @@
 
   if (wait_if_global_read_lock(thd, 0, 1))
     DBUG_RETURN(1);
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   if ((lock_retcode = lock_table_name(thd, table_list, TRUE)) < 0)
     goto end;
   if (lock_retcode && wait_for_locked_table_names(thd, table_list))
@@ -1600,8 +1600,8 @@
 
 void broadcast_refresh(void)
 {
-  VOID(pthread_cond_broadcast(&COND_refresh));
-  VOID(pthread_cond_broadcast(&COND_global_read_lock));
+  (void)(pthread_cond_broadcast(&COND_refresh));
+  (void)(pthread_cond_broadcast(&COND_global_read_lock));
 }
 
 
===== sql/log.cc 1.299 vs edited =====
--- 1.299/sql/log.cc	2007-10-18 20:45:04 +02:00
+++ edited/sql/log.cc	2007-11-03 02:22:00 +01:00
@@ -2654,7 +2654,7 @@
     thread. If the transaction involved MyISAM tables, it should go
     into binlog even on rollback.
   */
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
 
   /* Save variables so that we can reopen the log */
   save_name=name;
@@ -2686,7 +2686,7 @@
   my_free((uchar*) save_name, MYF(0));
 
 err:
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   pthread_mutex_unlock(&LOCK_index);
   pthread_mutex_unlock(&LOCK_log);
   DBUG_RETURN(error);
@@ -3567,7 +3567,7 @@
     if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
 	(!binlog_filter->db_ok(local_db)))
     {
-      VOID(pthread_mutex_unlock(&LOCK_log));
+      (void)(pthread_mutex_unlock(&LOCK_log));
       DBUG_PRINT("info",("OPTION_BIN_LOG is %s, db_ok('%s') == %d",
                          (thd->options & OPTION_BIN_LOG) ? "set" : "clear",
                          local_db, binlog_filter->db_ok(local_db)));
@@ -3981,7 +3981,7 @@
 bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
 {
   DBUG_ENTER("MYSQL_BIN_LOG::write(THD *, IO_CACHE *, Log_event *)");
-  VOID(pthread_mutex_lock(&LOCK_log));
+  (void)(pthread_mutex_lock(&LOCK_log));
 
   /* NULL would represent nothing to replicate after ROLLBACK */
   DBUG_ASSERT(commit_event != NULL);
@@ -4057,7 +4057,7 @@
     else
       rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
   }
-  VOID(pthread_mutex_unlock(&LOCK_log));
+  (void)(pthread_mutex_unlock(&LOCK_log));
 
   DBUG_RETURN(0);
 
@@ -4067,7 +4067,7 @@
     write_error= 1;
     sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
   }
-  VOID(pthread_mutex_unlock(&LOCK_log));
+  (void)(pthread_mutex_unlock(&LOCK_log));
   DBUG_RETURN(1);
 }
 
@@ -4264,7 +4264,7 @@
     char err_renamed[FN_REFLEN], *end;
     end= strmake(err_renamed,log_error_file,FN_REFLEN-4);
     strmov(end, "-old");
-    VOID(pthread_mutex_lock(&LOCK_error_log));
+    (void)(pthread_mutex_lock(&LOCK_error_log));
 #ifdef __WIN__
     char err_temp[FN_REFLEN+4];
     /*
@@ -4303,7 +4303,7 @@
    else
      result= 1;
 #endif
-    VOID(pthread_mutex_unlock(&LOCK_error_log));
+    (void)(pthread_mutex_unlock(&LOCK_error_log));
   }
    return result;
 }
@@ -4390,7 +4390,7 @@
   DBUG_ENTER("print_buffer_to_file");
   DBUG_PRINT("enter",("buffer: %s", buffer));
 
-  VOID(pthread_mutex_lock(&LOCK_error_log));
+  (void)(pthread_mutex_lock(&LOCK_error_log));
 
   skr= my_time(0);
   localtime_r(&skr, &tm_tmp);
@@ -4409,7 +4409,7 @@
 
   fflush(stderr);
 
-  VOID(pthread_mutex_unlock(&LOCK_error_log));
+  (void)(pthread_mutex_unlock(&LOCK_error_log));
   DBUG_VOID_RETURN;
 }
 
===== sql/log_event.cc 1.295 vs edited =====
--- 1.295/sql/log_event.cc	2007-10-18 22:39:08 +02:00
+++ edited/sql/log_event.cc	2007-11-03 02:22:00 +01:00
@@ -1987,9 +1987,9 @@
     thd->set_time((time_t)when);
     thd->query_length= q_len_arg;
     thd->query= (char*)query_arg;
-    VOID(pthread_mutex_lock(&LOCK_thread_count));
+    (void)(pthread_mutex_lock(&LOCK_thread_count));
     thd->query_id = next_query_id();
-    VOID(pthread_mutex_unlock(&LOCK_thread_count));
+    (void)(pthread_mutex_unlock(&LOCK_thread_count));
     thd->variables.pseudo_thread_id= thread_id;		// for temp tables
     DBUG_PRINT("query",("%s",thd->query));
 
@@ -2187,7 +2187,7 @@
   } /* End of if (db_ok(... */
 
 end:
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   /*
     Probably we have set thd->query, thd->db, thd->catalog to point to places
     in the data_buf of this event. Now the event is going to be deleted
@@ -2202,7 +2202,7 @@
   thd->set_db(NULL, 0);                 /* will free the current database */
   thd->query= 0;			// just to be sure
   thd->query_length= 0;
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   close_thread_tables(thd);      
   /*
     As a disk space optimization, future masters will not log an event for
@@ -3303,9 +3303,9 @@
   if (rpl_filter->db_ok(thd->db))
   {
     thd->set_time((time_t)when);
-    VOID(pthread_mutex_lock(&LOCK_thread_count));
+    (void)(pthread_mutex_lock(&LOCK_thread_count));
     thd->query_id = next_query_id();
-    VOID(pthread_mutex_unlock(&LOCK_thread_count));
+    (void)(pthread_mutex_unlock(&LOCK_thread_count));
     /*
       Initing thd->row_count is not necessary in theory as this variable has no
       influence in the case of the slave SQL thread (it is used to generate a
@@ -3459,12 +3459,12 @@
 error:
   thd->net.vio = 0; 
   const char *remember_db= thd->db;
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   thd->catalog= 0;
   thd->set_db(NULL, 0);                   /* will free the current database */
   thd->query= 0;
   thd->query_length= 0;
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   close_thread_tables(thd);
 
   DBUG_EXECUTE_IF("LOAD_DATA_INFILE_has_fatal_error",
===== sql/mysqld.cc 1.665 vs edited =====
--- 1.665/sql/mysqld.cc	2007-10-19 01:14:31 +02:00
+++ edited/sql/mysqld.cc	2007-11-03 02:22:00 +01:00
@@ -947,14 +947,14 @@
   {
     ip_sock=INVALID_SOCKET;
     DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
-    VOID(shutdown(tmp_sock, SHUT_RDWR));
+    (void)(shutdown(tmp_sock, SHUT_RDWR));
 #if defined(__NETWARE__)
     /*
       The following code is disabled for normal systems as it causes MySQL
       to hang on AIX 4.3 during shutdown
     */
     DBUG_PRINT("info",("calling closesocket on TCP/IP socket"));
-    VOID(closesocket(tmp_sock));
+    (void)(closesocket(tmp_sock));
 #endif
   }
   tmp_sock=unix_sock;
@@ -962,16 +962,16 @@
   {
     unix_sock=INVALID_SOCKET;
     DBUG_PRINT("info",("calling shutdown on unix socket"));
-    VOID(shutdown(tmp_sock, SHUT_RDWR));
+    (void)(shutdown(tmp_sock, SHUT_RDWR));
 #if defined(__NETWARE__)
     /*
       The following code is disabled for normal systems as it may cause MySQL
       to hang on AIX 4.3 during shutdown
     */
     DBUG_PRINT("info",("calling closesocket on unix/IP socket"));
-    VOID(closesocket(tmp_sock));
+    (void)(closesocket(tmp_sock));
 #endif
-    VOID(unlink(mysqld_unix_port));
+    (void)(unlink(mysqld_unix_port));
   }
   DBUG_VOID_RETURN;
 #endif
@@ -4594,7 +4594,7 @@
     if (!(thd= new THD))
     {
       (void) shutdown(new_sock, SHUT_RDWR);
-      VOID(closesocket(new_sock));
+      (void)(closesocket(new_sock));
       continue;
     }
     if (!(vio_tmp=vio_new(new_sock,
===== sql/opt_range.h 1.81 vs edited =====
--- 1.81/sql/opt_range.h	2007-06-27 21:15:25 +02:00
+++ edited/sql/opt_range.h	2007-11-03 17:01:19 +01:00
@@ -752,7 +752,7 @@
 public:
   FT_SELECT(THD *thd, TABLE *table, uint key, bool *create_err) :
       QUICK_RANGE_SELECT (thd, table, key, 1, NULL, create_err) 
-  { VOID(init()); }
+  { (void)init(); }
   ~FT_SELECT() { file->ft_end(); }
   int init() { return file->ft_init(); }
   int reset() { return 0; }
===== sql/protocol.cc 1.133 vs edited =====
--- 1.133/sql/protocol.cc	2007-10-16 17:37:23 +02:00
+++ edited/sql/protocol.cc	2007-11-03 02:22:01 +01:00
@@ -281,7 +281,7 @@
       memcpy(pos+3, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH);
     }
   }
-  VOID(net_real_write(net, net->buff, length+head_length+1+offset));
+  (void)(net_real_write(net, net->buff, length+head_length+1+offset));
 #else
   net->last_errno= errcode;
   strmake(net->last_error, text_pos, length);
@@ -362,8 +362,8 @@
   }
   if (message)
     pos= net_store_data(pos, (uchar*) message, strlen(message));
-  VOID(my_net_write(net, buff, (size_t) (pos-buff)));
-  VOID(net_flush(net));
+  (void)(my_net_write(net, buff, (size_t) (pos-buff)));
+  (void)(net_flush(net));
   /* We can't anymore send an error to the client */
   thd->net.report_error= 0;
   thd->net.no_send_error= 1;
@@ -404,7 +404,7 @@
   if (net->vio != 0)
   {
     write_eof_packet(thd, net);
-    VOID(net_flush(net));
+    (void)(net_flush(net));
     thd->net.no_send_error= 1;
     DBUG_PRINT("info", ("EOF sent, so no more error sending allowed"));
   }
@@ -437,10 +437,10 @@
     if (thd->is_fatal_error)
       thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
     int2store(buff+3, thd->server_status);
-    VOID(my_net_write(net, buff, 5));
+    (void)(my_net_write(net, buff, 5));
   }
   else
-    VOID(my_net_write(net, eof_buff, 1));
+    (void)(my_net_write(net, eof_buff, 1));
 }
 
 /*
@@ -491,7 +491,7 @@
                   (char*) buff);
   err= (char*) buff;
 
-  VOID(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
+  (void)(net_write_command(net,(uchar) 255, (uchar*) "", 0, (uchar*) err,
                          length));
   DBUG_VOID_RETURN;
 }
===== sql/records.cc 1.51 vs edited =====
--- 1.51/sql/records.cc	2007-07-12 12:32:04 +02:00
+++ edited/sql/records.cc	2007-11-03 02:22:01 +01:00
@@ -152,7 +152,7 @@
   
   if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE &&
       !table->sort.addon_field)
-    VOID(table->file->extra(HA_EXTRA_MMAP));
+    (void)(table->file->extra(HA_EXTRA_MMAP));
   
   if (table->sort.addon_field)
   {
@@ -237,7 +237,7 @@
 	 !(table->s->db_options_in_use & HA_OPTION_PACK_RECORD) ||
 	 (use_record_cache < 0 &&
 	  !(table->file->ha_table_flags() & HA_NOT_DELETE_WITH_CACHE))))
-      VOID(table->file->extra_opt(HA_EXTRA_CACHE,
+      (void)(table->file->extra_opt(HA_EXTRA_CACHE,
 				  thd->variables.read_buff_size));
   }
   /* 
===== sql/slave.cc 1.315 vs edited =====
--- 1.315/sql/slave.cc	2007-09-11 19:44:02 +02:00
+++ edited/sql/slave.cc	2007-11-03 02:22:01 +01:00
@@ -2104,10 +2104,10 @@
   // print the current replication position
   sql_print_information("Slave I/O thread exiting, read up to log '%s', position %s",
                   IO_RPL_LOG_NAME, llstr(mi->master_log_pos,llbuff));
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   thd->query = thd->db = 0; // extra safety
   thd->query_length= thd->db_length= 0;
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   if (mysql)
   {
     /*
@@ -2372,7 +2372,7 @@
     must "proactively" clear playgrounds:
   */
   rli->cleanup_context(thd, 1);
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   /*
     Some extra safety, which should not been needed (normally, event deletion
     should already have done these assignments (each event which sets these
@@ -2380,7 +2380,7 @@
   */
   thd->query= thd->db= thd->catalog= 0;
   thd->query_length= thd->db_length= 0;
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   THD_SET_PROC_INFO(thd, "Waiting for slave mutex on exit");
   pthread_mutex_lock(&rli->run_lock);
   /* We need data_lock, at least to wake up any waiting master_pos_wait() */
===== sql/sp_head.cc 1.294 vs edited =====
--- 1.294/sql/sp_head.cc	2007-10-18 22:39:08 +02:00
+++ edited/sql/sp_head.cc	2007-11-03 02:22:02 +01:00
@@ -1672,9 +1672,9 @@
       as one select and not resetting THD::user_var_events before
       each invocation.
     */
-    VOID(pthread_mutex_lock(&LOCK_thread_count));
+    (void)(pthread_mutex_lock(&LOCK_thread_count));
     q= global_query_id;
-    VOID(pthread_mutex_unlock(&LOCK_thread_count));
+    (void)(pthread_mutex_unlock(&LOCK_thread_count));
     mysql_bin_log.start_union_events(thd, q + 1);
     binlog_save_options= thd->options;
     thd->options&= ~OPTION_BIN_LOG;
@@ -2600,9 +2600,9 @@
   */
   thd->lex= m_lex;
 
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   thd->query_id= next_query_id();
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
 
   if (thd->prelocked_mode == NON_PRELOCKED)
   {
===== sql/sp_pcontext.cc 1.35 vs edited =====
--- 1.35/sql/sp_pcontext.cc	2007-06-10 12:43:54 +02:00
+++ edited/sql/sp_pcontext.cc	2007-11-03 02:22:02 +01:00
@@ -60,19 +60,19 @@
   m_context_handlers(0), m_parent(NULL), m_pboundary(0),
   m_label_scope(LABEL_DEFAULT_SCOPE)
 {
-  VOID(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
+  (void)(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
+  (void)(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
+  (void)(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
+  (void)(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
+  (void)(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
   m_label.empty();
@@ -88,19 +88,19 @@
   m_context_handlers(0), m_parent(prev), m_pboundary(0),
   m_label_scope(label_scope)
 {
-  VOID(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
+  (void)(my_init_dynamic_array(&m_vars, sizeof(sp_variable_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
+  (void)(my_init_dynamic_array(&m_case_expr_id_lst, sizeof(int),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
+  (void)(my_init_dynamic_array(&m_conds, sizeof(sp_cond_type_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
+  (void)(my_init_dynamic_array(&m_cursors, sizeof(LEX_STRING),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
-  VOID(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
+  (void)(my_init_dynamic_array(&m_handlers, sizeof(sp_cond_type_t *),
                              PCONTEXT_ARRAY_INIT_ALLOC,
                              PCONTEXT_ARRAY_INCREMENT_ALLOC));
   m_label.empty();
===== sql/sql_acl.cc 1.244 vs edited =====
--- 1.244/sql/sql_acl.cc	2007-10-05 18:35:37 +02:00
+++ edited/sql/sql_acl.cc	2007-11-03 02:22:02 +01:00
@@ -322,7 +322,7 @@
   init_sql_alloc(&mem, ACL_ALLOC_BLOCK_SIZE, 0);
   init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
   table->use_all_columns();
-  VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
+  (void)(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
   while (!(read_record_info.read_record(&read_record_info)))
   {
     ACL_HOST host;
@@ -362,7 +362,7 @@
 	host.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL;
     }
 #endif
-    VOID(push_dynamic(&acl_hosts,(uchar*) &host));
+    (void)(push_dynamic(&acl_hosts,(uchar*) &host));
   }
   qsort((uchar*) dynamic_element(&acl_hosts,0,ACL_HOST*),acl_hosts.elements,
 	sizeof(ACL_HOST),(qsort_cmp) acl_compare);
@@ -371,7 +371,7 @@
 
   init_read_record(&read_record_info,thd,table=tables[1].table,NULL,1,0);
   table->use_all_columns();
-  VOID(my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
+  (void)(my_init_dynamic_array(&acl_users,sizeof(ACL_USER),50,100));
   password_length= table->field[2]->field_length /
     table->field[2]->charset()->mbmaxlen;
   if (password_length < SCRAMBLED_PASSWORD_CHAR_LENGTH_323)
@@ -546,7 +546,7 @@
           user.access|= SUPER_ACL | EXECUTE_ACL;
 #endif
       }
-      VOID(push_dynamic(&acl_users,(uchar*) &user));
+      (void)(push_dynamic(&acl_users,(uchar*) &user));
       if (!user.host.hostname ||
 	  (user.host.hostname[0] == wild_many && !user.host.hostname[1]))
         allow_all_hosts=1;			// Anyone can connect
@@ -559,7 +559,7 @@
 
   init_read_record(&read_record_info,thd,table=tables[2].table,NULL,1,0);
   table->use_all_columns();
-  VOID(my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
+  (void)(my_init_dynamic_array(&acl_dbs,sizeof(ACL_DB),50,100));
   while (!(read_record_info.read_record(&read_record_info)))
   {
     ACL_DB db;
@@ -609,7 +609,7 @@
 	db.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL;
     }
 #endif
-    VOID(push_dynamic(&acl_dbs,(uchar*) &db));
+    (void)(push_dynamic(&acl_dbs,(uchar*) &db));
   }
   qsort((uchar*) dynamic_element(&acl_dbs,0,ACL_DB*),acl_dbs.elements,
 	sizeof(ACL_DB),(qsort_cmp) acl_compare);
@@ -699,7 +699,7 @@
   }
 
   if ((old_initialized=initialized))
-    VOID(pthread_mutex_lock(&acl_cache->lock));
+    (void)(pthread_mutex_lock(&acl_cache->lock));
 
   old_acl_hosts=acl_hosts;
   old_acl_users=acl_users;
@@ -726,7 +726,7 @@
     delete_dynamic(&old_acl_dbs);
   }
   if (old_initialized)
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
 end:
   close_thread_tables(thd);
   DBUG_RETURN(return_val);
@@ -876,7 +876,7 @@
     DBUG_RETURN(0);
   }
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   /*
     Find acl entry in user database. Note, that find_acl_user is not the same,
@@ -1048,7 +1048,7 @@
     else
       *sctx->priv_host= 0;
   }
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   DBUG_RETURN(res);
 }
 
@@ -1095,7 +1095,7 @@
     DBUG_RETURN(FALSE);
   }
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   sctx->master_access= 0;
   sctx->db_access= 0;
@@ -1149,7 +1149,7 @@
     else
       *sctx->priv_host= 0;
   }
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   DBUG_RETURN(res);
 }
 
@@ -1238,7 +1238,7 @@
 
   set_user_salt(&acl_user, password, password_len);
 
-  VOID(push_dynamic(&acl_users,(uchar*) &acl_user));
+  (void)(push_dynamic(&acl_users,(uchar*) &acl_user));
   if (!acl_user.host.hostname ||
       (acl_user.host.hostname[0] == wild_many && !acl_user.host.hostname[1]))
     allow_all_hosts=1;		// Anyone can connect /* purecov: tested */
@@ -1304,7 +1304,7 @@
   acl_db.db=strdup_root(&mem,db);
   acl_db.access=privileges;
   acl_db.sort=get_sort(3,acl_db.host.hostname,acl_db.db,acl_db.user);
-  VOID(push_dynamic(&acl_dbs,(uchar*) &acl_db));
+  (void)(push_dynamic(&acl_dbs,(uchar*) &acl_db));
   qsort((uchar*) dynamic_element(&acl_dbs,0,ACL_DB*),acl_dbs.elements,
 	sizeof(ACL_DB),(qsort_cmp) acl_compare);
 }
@@ -1328,7 +1328,7 @@
   acl_entry *entry;
   DBUG_ENTER("acl_get");
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
   end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db);
   if (lower_case_table_names)
   {
@@ -1340,7 +1340,7 @@
                                                               key_length)))
   {
     db_access=entry->access;
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
     DBUG_PRINT("exit", ("access: 0x%lx", db_access));
     DBUG_RETURN(db_access);
   }
@@ -1394,7 +1394,7 @@
     memcpy((uchar*) entry->key,key,key_length);
     acl_cache->add(entry);
   }
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   DBUG_PRINT("exit", ("access: 0x%lx", db_access & host_access));
   DBUG_RETURN(db_access & host_access);
 }
@@ -1410,9 +1410,9 @@
 static void init_check_host(void)
 {
   DBUG_ENTER("init_check_host");
-  VOID(my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
+  (void)(my_init_dynamic_array(&acl_wild_hosts,sizeof(struct acl_host_and_ip),
 			  acl_users.elements,1));
-  VOID(hash_init(&acl_check_hosts,system_charset_info,acl_users.elements,0,0,
+  (void)(hash_init(&acl_check_hosts,system_charset_info,acl_users.elements,0,0,
 		 (hash_get_key) check_get_key,0,0));
   if (!allow_all_hosts)
   {
@@ -1474,12 +1474,12 @@
 {
   if (allow_all_hosts)
     return 0;
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   if (host && hash_search(&acl_check_hosts,(uchar*) host,strlen(host)) ||
       ip && hash_search(&acl_check_hosts,(uchar*) ip, strlen(ip)))
   {
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
     return 0;					// Found host
   }
   for (uint i=0 ; i < acl_wild_hosts.elements ; i++)
@@ -1487,11 +1487,11 @@
     acl_host_and_ip *acl=dynamic_element(&acl_wild_hosts,i,acl_host_and_ip*);
     if (compare_hostname(acl, host, ip))
     {
-      VOID(pthread_mutex_unlock(&acl_cache->lock));
+      (void)(pthread_mutex_unlock(&acl_cache->lock));
       return 0;					// Host ok
     }
   }
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   return 1;					// Host is not allowed
 }
 
@@ -1605,11 +1605,11 @@
   if (!(table= open_ltable(thd, &tables, TL_WRITE, 0)))
     DBUG_RETURN(1);
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
   ACL_USER *acl_user;
   if (!(acl_user= find_acl_user(host, user, TRUE)))
   {
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
     my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH), MYF(0));
     goto end;
   }
@@ -1621,12 +1621,12 @@
 			acl_user->user ? acl_user->user : "",
 			new_password, new_password_len))
   {
-    VOID(pthread_mutex_unlock(&acl_cache->lock)); /* purecov: deadcode */
+    (void)(pthread_mutex_unlock(&acl_cache->lock)); /* purecov: deadcode */
     goto end;
   }
 
   acl_cache->clear(1);				// Clear locked hostname cache
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   result= 0;
   if (mysql_bin_log.is_open())
   {
@@ -1666,9 +1666,9 @@
   if (!initialized)
     return TRUE;
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
   res= find_acl_user(host, user, TRUE) != NULL;
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   return res;
 }
 
@@ -3409,7 +3409,7 @@
 
   /* go through users in user_list */
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
   grant_version++;
 
   int result=0;
@@ -3441,7 +3441,7 @@
       }
     }
   }
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   if (!result)
   {
@@ -4348,12 +4348,12 @@
   }
 
   rw_rdlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   acl_user= find_acl_user(lex_user->host.str, lex_user->user.str, TRUE);
   if (!acl_user)
   {
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
     rw_unlock(&LOCK_grant);
 
     my_error(ER_NONEXISTING_GRANT, MYF(0),
@@ -4371,7 +4371,7 @@
   if (protocol->send_fields(&field_list,
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
   {
-    VOID(pthread_mutex_unlock(&acl_cache->lock));
+    (void)(pthread_mutex_unlock(&acl_cache->lock));
     rw_unlock(&LOCK_grant);
 
     DBUG_RETURN(TRUE);
@@ -4682,7 +4682,7 @@
   }
 
 end:
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   rw_unlock(&LOCK_grant);
 
   send_eof(thd);
@@ -5468,7 +5468,7 @@
     DBUG_RETURN(result != 1);
 
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   while ((tmp_user_name= user_list++))
   {
@@ -5497,7 +5497,7 @@
     }
   }
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   write_bin_log(thd, FALSE, thd->query, thd->query_length);
 
@@ -5543,7 +5543,7 @@
     DBUG_RETURN(result != 1);
 
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   while ((tmp_user_name= user_list++))
   {
@@ -5563,7 +5563,7 @@
   /* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
   rebuild_check_host();
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   if (result)
     my_error(ER_CANNOT_USER, MYF(0), "DROP USER", wrong_users.c_ptr_safe());
@@ -5614,7 +5614,7 @@
     DBUG_RETURN(result != 1);
 
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   while ((tmp_user_from= user_list++))
   {
@@ -5646,7 +5646,7 @@
   /* Rebuild 'acl_check_hosts' since 'acl_users' has been modified */
   rebuild_check_host();
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   write_bin_log(thd, FALSE, thd->query, thd->query_length);
 
@@ -5691,7 +5691,7 @@
     DBUG_RETURN(result != 1);
 
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   LEX_USER *lex_user, *tmp_lex_user;
   List_iterator <LEX_USER> user_list(list);
@@ -5830,7 +5830,7 @@
     } while (revoked);
   }
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   write_bin_log(thd, FALSE, thd->query, thd->query_length);
 
@@ -5871,7 +5871,7 @@
     DBUG_RETURN(result != 1);
 
   rw_wrlock(&LOCK_grant);
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   /*
     This statement will be replicated as a statement, even when using
@@ -5909,7 +5909,7 @@
     }
   } while (revoked);
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   rw_unlock(&LOCK_grant);
   close_thread_tables(thd);
 
@@ -5951,7 +5951,7 @@
 
   combo->user.str= sctx->user;
 
-  VOID(pthread_mutex_lock(&acl_cache->lock));
+  (void)(pthread_mutex_lock(&acl_cache->lock));
 
   if ((au= find_acl_user(combo->host.str=(char*)sctx->host_or_ip,combo->user.str,FALSE)))
     goto found_acl;
@@ -5962,11 +5962,11 @@
   if((au= find_acl_user(combo->host.str=(char*)"%", combo->user.str, FALSE)))
     goto found_acl;
 
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
   DBUG_RETURN(TRUE);
 
  found_acl:
-  VOID(pthread_mutex_unlock(&acl_cache->lock));
+  (void)(pthread_mutex_unlock(&acl_cache->lock));
 
   bzero((char*)tables, sizeof(TABLE_LIST));
   user_list.empty();
===== sql/sql_base.cc 1.399 vs edited =====
--- 1.399/sql/sql_base.cc	2007-10-19 22:17:45 +02:00
+++ edited/sql/sql_base.cc	2007-11-03 02:22:02 +01:00
@@ -467,7 +467,7 @@
          oldest_unused_share->next)
   {
     pthread_mutex_lock(&oldest_unused_share->mutex);
-    VOID(hash_delete(&table_def_cache, (uchar*) oldest_unused_share));
+    (void)(hash_delete(&table_def_cache, (uchar*) oldest_unused_share));
   }
 
   DBUG_PRINT("exit", ("share: 0x%lx  ref_count: %u",
@@ -746,7 +746,7 @@
   TABLE_LIST table_list;
   DBUG_ENTER("list_open_tables");
 
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   bzero((char*) &table_list,sizeof(table_list));
   start_list= &open_list;
   open_list=0;
@@ -799,7 +799,7 @@
     start_list= &(*start_list)->next;
     *start_list=0;
   }
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(open_list);
 }
 
@@ -815,7 +815,7 @@
   free_io_cache(table);
   delete table->triggers;
   if (table->file)                              // Not true if name lock
-    VOID(closefrm(table, 1));			// close file
+    (void)(closefrm(table, 1));			// close file
   DBUG_VOID_RETURN;
 }
 
@@ -881,7 +881,7 @@
   DBUG_ASSERT(thd || (!if_wait_for_refresh && !tables));
 
   if (!have_lock)
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
   if (!tables)
   {
     refresh_version++;				// Force close of open tables
@@ -891,14 +891,14 @@
       if (hash_delete(&open_cache,(uchar*) unused_tables))
 	printf("Warning: Couldn't delete open table from hash\n");
 #else
-      VOID(hash_delete(&open_cache,(uchar*) unused_tables));
+      (void)(hash_delete(&open_cache,(uchar*) unused_tables));
 #endif
     }
     /* Free table shares */
     while (oldest_unused_share->next)
     {
       pthread_mutex_lock(&oldest_unused_share->mutex);
-      VOID(hash_delete(&table_def_cache, (uchar*) oldest_unused_share));
+      (void)(hash_delete(&table_def_cache, (uchar*) oldest_unused_share));
     }
   }
   else
@@ -976,7 +976,7 @@
       table->s->version= refresh_version;
   }
   if (!have_lock)
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   if (if_wait_for_refresh)
   {
     pthread_mutex_lock(&thd->mysys_var->mutex);
@@ -1006,7 +1006,7 @@
   bzero(&tmp, sizeof(TABLE_LIST));
   
   if (!have_lock)
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
   
   for (idx= 0; idx < table_def_cache.records; idx++)
   {
@@ -1039,7 +1039,7 @@
     result= close_cached_tables(thd, FALSE, tables, TRUE);
   
   if (!have_lock)
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   
   if (if_wait_for_refresh)
   {
@@ -1217,7 +1217,7 @@
     thd->transaction.xid_state.xid.null();
 
   if (!lock_in_use)
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
 
   DBUG_PRINT("info", ("thd->open_tables: 0x%lx", (long) thd->open_tables));
 
@@ -1228,7 +1228,7 @@
 
   /* Free tables to hold down open files */
   while (open_cache.records > table_cache_size && unused_tables)
-    VOID(hash_delete(&open_cache,(uchar*) unused_tables)); /* purecov: tested */
+    (void)(hash_delete(&open_cache,(uchar*) unused_tables)); /* purecov: tested */
   check_unused();
   if (found_old_table)
   {
@@ -1236,8 +1236,8 @@
     broadcast_refresh();
   }
   if (!lock_in_use)
-    VOID(pthread_mutex_unlock(&LOCK_open));
-  /*  VOID(pthread_sigmask(SIG_SETMASK,&thd->signals,NULL)); */
+    (void)(pthread_mutex_unlock(&LOCK_open));
+  /*  (void)(pthread_sigmask(SIG_SETMASK,&thd->signals,NULL)); */
 
   if (prelocked_mode == PRELOCKED)
   {
@@ -1267,7 +1267,7 @@
   if (table->needs_reopen_or_name_lock() ||
       thd->version != refresh_version || !table->db_stat)
   {
-    VOID(hash_delete(&open_cache,(uchar*) table));
+    (void)(hash_delete(&open_cache,(uchar*) table));
     found_old_table=1;
   }
   else
@@ -1856,7 +1856,7 @@
     {
       if (unlock && thd->locked_tables)
         mysql_lock_remove(thd, thd->locked_tables, list, TRUE);
-      VOID(hash_delete(&open_cache,(uchar*) list)); // Close table
+      (void)(hash_delete(&open_cache,(uchar*) list)); // Close table
     }
     else
     {
@@ -1898,14 +1898,14 @@
   else
   {
     handlerton *table_type= table->s->db_type();
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     /*
       unlink_open_table() also tells threads waiting for refresh or close
       that something has happened.
     */
     unlink_open_table(thd, table, FALSE);
     quick_rm_table(table_type, db_name, table_name, 0);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   }
 }
 
@@ -2124,24 +2124,24 @@
   DBUG_ENTER("lock_table_name_if_not_cached");
 
   key_length= (uint)(strmov(strmov(key, db) + 1, table_name) - key) + 1;
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
 
   if (hash_search(&open_cache, (uchar *)key, key_length))
   {
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     DBUG_PRINT("info", ("Table is cached, name-lock is not obtained"));
     *table= 0;
     DBUG_RETURN(FALSE);
   }
   if (!(*table= table_cache_insert_placeholder(thd, key, key_length)))
   {
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     DBUG_RETURN(TRUE);
   }
   (*table)->open_placeholder= 1;
   (*table)->next= thd->open_tables;
   thd->open_tables= *table;
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(FALSE);
 }
 
@@ -2408,15 +2408,15 @@
         */
         TABLE tab;
         table= &tab;
-        VOID(pthread_mutex_lock(&LOCK_open));
+        (void)(pthread_mutex_lock(&LOCK_open));
         if (!open_unireg_entry(thd, table, table_list, alias,
                               key, key_length, mem_root, 0))
         {
           DBUG_ASSERT(table_list->view != 0);
-          VOID(pthread_mutex_unlock(&LOCK_open));
+          (void)(pthread_mutex_unlock(&LOCK_open));
           DBUG_RETURN(0); // VIEW
         }
-        VOID(pthread_mutex_unlock(&LOCK_open));
+        (void)(pthread_mutex_unlock(&LOCK_open));
       }
     }
     /*
@@ -2449,7 +2449,7 @@
     on disk.
   */
 
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
 
   /*
     If it's the first table from a list of tables used in a query,
@@ -2467,7 +2467,7 @@
     /* Someone did a refresh while thread was opening tables */
     if (refresh)
       *refresh=1;
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     DBUG_RETURN(0);
   }
 
@@ -2531,7 +2531,7 @@
       /* Avoid self-deadlocks by detecting self-dependencies. */
       if (table->open_placeholder && table->in_use == thd)
       {
-	VOID(pthread_mutex_unlock(&LOCK_open));
+	(void)(pthread_mutex_unlock(&LOCK_open));
         my_error(ER_UPDATE_TABLE_USED, MYF(0), table->s->table_name.str);
         DBUG_RETURN(0);
       }
@@ -2572,7 +2572,7 @@
       }
       else
       {
-	VOID(pthread_mutex_unlock(&LOCK_open));
+	(void)(pthread_mutex_unlock(&LOCK_open));
       }
       /*
         There is a refresh in progress for this table.
@@ -2602,7 +2602,7 @@
     int error;
     /* Free cache if too big */
     while (open_cache.records > table_cache_size && unused_tables)
-      VOID(hash_delete(&open_cache,(uchar*) unused_tables)); /* purecov: tested */
+      (void)(hash_delete(&open_cache,(uchar*) unused_tables)); /* purecov: tested */
 
     if (table_list->create)
     {
@@ -2610,7 +2610,7 @@
 
       if (check_if_table_exists(thd, table_list, &exists))
       {
-        VOID(pthread_mutex_unlock(&LOCK_open));
+        (void)(pthread_mutex_unlock(&LOCK_open));
         DBUG_RETURN(NULL);
       }
 
@@ -2621,7 +2621,7 @@
         */
         if (!(table= table_cache_insert_placeholder(thd, key, key_length)))
         {
-          VOID(pthread_mutex_unlock(&LOCK_open));
+          (void)(pthread_mutex_unlock(&LOCK_open));
           DBUG_RETURN(NULL);
         }
         /*
@@ -2632,7 +2632,7 @@
         table->open_placeholder= 1;
         table->next= thd->open_tables;
         thd->open_tables= table;
-        VOID(pthread_mutex_unlock(&LOCK_open));
+        (void)(pthread_mutex_unlock(&LOCK_open));
         DBUG_RETURN(table);
       }
       /* Table exists. Let us try to open it. */
@@ -2641,7 +2641,7 @@
     /* make a new table */
     if (!(table=(TABLE*) my_malloc(sizeof(*table),MYF(MY_WME))))
     {
-      VOID(pthread_mutex_unlock(&LOCK_open));
+      (void)(pthread_mutex_unlock(&LOCK_open));
       DBUG_RETURN(NULL);
     }
 
@@ -2650,7 +2650,7 @@
     if (error > 0)
     {
       my_free((uchar*)table, MYF(0));
-      VOID(pthread_mutex_unlock(&LOCK_open));
+      (void)(pthread_mutex_unlock(&LOCK_open));
       DBUG_RETURN(NULL);
     }
     if (table_list->view || error < 0)
@@ -2663,16 +2663,16 @@
         table_list->view= (st_lex*)1;
 
       my_free((uchar*)table, MYF(0));
-      VOID(pthread_mutex_unlock(&LOCK_open));
+      (void)(pthread_mutex_unlock(&LOCK_open));
       DBUG_RETURN(0); // VIEW
     }
     DBUG_PRINT("info", ("inserting table 0x%lx into the cache", (long) table));
-    VOID(my_hash_insert(&open_cache,(uchar*) table));
+    (void)(my_hash_insert(&open_cache,(uchar*) table));
   }
 
   check_unused();				// Debugging call
 
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   if (refresh)
   {
     table->next=thd->open_tables;		/* Link into simple list */
@@ -2801,7 +2801,7 @@
 
   delete table->triggers;
   if (table->file)
-    VOID(closefrm(table, 1));		// close file, free everything
+    (void)(closefrm(table, 1));		// close file, free everything
 
   *table= tmp;
   table->default_column_bitmaps();
@@ -2932,7 +2932,7 @@
     if (!tables || (!db_stat && reopen_table(table)))
     {
       my_error(ER_CANT_REOPEN_TABLE, MYF(0), table->alias);
-      VOID(hash_delete(&open_cache,(uchar*) table));
+      (void)(hash_delete(&open_cache,(uchar*) table));
       error=1;
     }
     else
@@ -3169,7 +3169,7 @@
       else
       {
         /* We already have a name lock, remove copy */
-        VOID(hash_delete(&open_cache,(uchar*) table));
+        (void)(hash_delete(&open_cache,(uchar*) table));
       }
     }
     else
@@ -7113,7 +7113,7 @@
           So we hide error messages which happnes during deleting of these
           files(MYF(0)).
         */
-        VOID(my_delete(filePath, MYF(0))); 
+        (void)(my_delete(filePath, MYF(0))); 
       }
     }
     my_dirend(dirp);
@@ -7155,7 +7155,7 @@
     }
   }
   while (unused_tables && !unused_tables->s->version)
-    VOID(hash_delete(&open_cache,(uchar*) unused_tables));
+    (void)(hash_delete(&open_cache,(uchar*) unused_tables));
 }
 
 
@@ -7271,7 +7271,7 @@
       }
     }
     while (unused_tables && !unused_tables->s->version)
-      VOID(hash_delete(&open_cache,(uchar*) unused_tables));
+      (void)(hash_delete(&open_cache,(uchar*) unused_tables));
 
     DBUG_PRINT("info", ("Removing table from table_def_cache"));
     /* Remove table from table definition cache if it's not in use */
@@ -7284,7 +7284,7 @@
       if (share->ref_count == 0)
       {
         pthread_mutex_lock(&share->mutex);
-        VOID(hash_delete(&table_def_cache, (uchar*) share));
+        (void)(hash_delete(&table_def_cache, (uchar*) share));
       }
     }
 
@@ -7461,10 +7461,10 @@
   DBUG_ENTER("abort_and_upgrade_locks");
 
   lpt->old_lock_type= lpt->table->reginfo.lock_type;
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   mysql_lock_abort(lpt->thd, lpt->table, TRUE);
-  VOID(remove_table_from_cache(lpt->thd, lpt->db, lpt->table_name, flags));
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(remove_table_from_cache(lpt->thd, lpt->db, lpt->table_name, flags));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(0);
 }
 
@@ -7485,10 +7485,10 @@
 
 void close_open_tables_and_downgrade(ALTER_PARTITION_PARAM_TYPE *lpt)
 {
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   remove_table_from_cache(lpt->thd, lpt->db, lpt->table_name,
                           RTFC_WAIT_OTHER_THREAD_FLAG);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   mysql_lock_downgrade_write(lpt->thd, lpt->table, lpt->old_lock_type);
 }
 
@@ -7524,7 +7524,7 @@
   DBUG_ENTER("mysql_wait_completed_table");
 
   key_length=(uint) (strmov(strmov(key,lpt->db)+1,lpt->table_name)-key)+1;
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   HASH_SEARCH_STATE state;
   for (table= (TABLE*) hash_first(&open_cache,(uchar*) key,key_length,
                                   &state) ;
@@ -7574,7 +7574,7 @@
     by our lock. We don't upgrade our lock here.
   */
   mysql_lock_abort(lpt->thd, my_table, FALSE);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_VOID_RETURN;
 }
 
===== sql/sql_cache.cc 1.129 vs edited =====
--- 1.129/sql/sql_cache.cc	2007-10-16 15:05:01 +02:00
+++ edited/sql/sql_cache.cc	2007-11-03 02:22:02 +01:00
@@ -1885,7 +1885,7 @@
 
   DUMP(this);
 
-  VOID(hash_init(&queries, &my_charset_bin, def_query_hash_size, 0, 0,
+  (void)(hash_init(&queries, &my_charset_bin, def_query_hash_size, 0, 0,
 		 query_cache_query_get_key, 0, 0));
 #ifndef FN_NO_CASE_SENCE
   /*
@@ -1896,7 +1896,7 @@
     lower_case_table_names == 0 then we should distinguish my_table
     and MY_TABLE cases and so again can use binary collation.
   */
-  VOID(hash_init(&tables, &my_charset_bin, def_table_hash_size, 0, 0,
+  (void)(hash_init(&tables, &my_charset_bin, def_table_hash_size, 0, 0,
 		 query_cache_table_get_key, 0, 0));
 #else
   /*
@@ -1907,7 +1907,7 @@
     file system) and so should use case insensitive collation for
     comparison.
   */
-  VOID(hash_init(&tables,
+  (void)(hash_init(&tables,
 		 lower_case_table_names ? &my_charset_bin :
 		 files_charset_info,
 		 def_table_hash_size, 0, 0,query_cache_table_get_key, 0, 0));
===== sql/sql_connect.cc 1.14 vs edited =====
--- 1.14/sql/sql_connect.cc	2007-10-10 17:14:13 +02:00
+++ edited/sql/sql_connect.cc	2007-11-03 02:22:03 +01:00
@@ -421,10 +421,10 @@
 
       if (check_count)
       {
-        VOID(pthread_mutex_lock(&LOCK_thread_count));
+        (void)(pthread_mutex_lock(&LOCK_thread_count));
         bool count_ok= thread_count <= max_connections + delayed_insert_threads
                        || (thd->main_security_ctx.master_access & SUPER_ACL);
-        VOID(pthread_mutex_unlock(&LOCK_thread_count));
+        (void)(pthread_mutex_unlock(&LOCK_thread_count));
         if (!count_ok)
         {                                         // too many connections
           net_send_error(thd, ER_CON_COUNT_ERROR);
===== sql/sql_db.cc 1.163 vs edited =====
--- 1.163/sql/sql_db.cc	2007-10-09 01:34:24 +02:00
+++ edited/sql/sql_db.cc	2007-11-03 02:22:03 +01:00
@@ -643,7 +643,7 @@
     goto exit2;
   }
 
-  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_lock(&LOCK_mysql_create_db));
 
   /* Check directory */
   path_len= build_table_filename(path, sizeof(path), db, "", "", 0);
@@ -753,7 +753,7 @@
   }
 
 exit:
-  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_unlock(&LOCK_mysql_create_db));
   start_waiting_global_read_lock(thd);
 exit2:
   DBUG_RETURN(error);
@@ -784,7 +784,7 @@
   if ((error=wait_if_global_read_lock(thd,0,1)))
     goto exit2;
 
-  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_lock(&LOCK_mysql_create_db));
 
   /* 
      Recreate db options file: /dbpath/.db.opt
@@ -829,7 +829,7 @@
   send_ok(thd, result);
 
 exit:
-  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_unlock(&LOCK_mysql_create_db));
   start_waiting_global_read_lock(thd);
 exit2:
   DBUG_RETURN(error);
@@ -881,7 +881,7 @@
     goto exit2;
   }
 
-  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_lock(&LOCK_mysql_create_db));
 
   length= build_table_filename(path, sizeof(path), db, "", "", 0);
   strmov(path+length, MY_DB_OPT_FILE);		// Append db option file name
@@ -1002,7 +1002,7 @@
   */
   if (thd->db && !strcmp(thd->db, db))
     mysql_change_db_impl(thd, NULL, 0, thd->variables.collation_server);
-  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
+  (void)(pthread_mutex_unlock(&LOCK_mysql_create_db));
   start_waiting_global_read_lock(thd);
 exit2:
   DBUG_RETURN(error);
@@ -1108,7 +1108,7 @@
 	goto err;
       table_list->db= (char*) (table_list+1);
       table_list->table_name= strmov(table_list->db, db) + 1;
-      VOID(filename_to_tablename(file->name, table_list->table_name,
+      (void)(filename_to_tablename(file->name, table_list->table_name,
                                  strlen(file->name) + 1));
       table_list->alias= table_list->table_name;	// If lower_case_table_names=2
       /* Link into list */
===== sql/sql_delete.cc 1.218 vs edited =====
--- 1.218/sql/sql_delete.cc	2007-10-17 19:05:00 +02:00
+++ edited/sql/sql_delete.cc	2007-11-03 02:22:03 +01:00
@@ -985,10 +985,10 @@
   // crashes, replacement works.  *(path + path_length - reg_ext_length)=
   // '\0';
   path[path_length - reg_ext_length] = 0;
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   error= ha_create_table(thd, path, table_list->db, table_list->table_name,
                          &create_info, 1);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   query_cache_invalidate3(thd, table_list, 0);
 
 end:
@@ -1003,15 +1003,15 @@
       write_bin_log(thd, TRUE, thd->query, thd->query_length);
       send_ok(thd);		// This should return record count
     }
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     unlock_table_name(thd, table_list);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   }
   else if (error)
   {
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     unlock_table_name(thd, table_list);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   }
   DBUG_RETURN(error);
 
===== sql/sql_handler.cc 1.106 vs edited =====
--- 1.106/sql/sql_handler.cc	2007-10-15 13:52:25 +02:00
+++ edited/sql/sql_handler.cc	2007-11-03 02:22:03 +01:00
@@ -143,13 +143,13 @@
   if (*table_ptr)
   {
     (*table_ptr)->file->ha_index_or_rnd_end();
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     if (close_thread_table(thd, table_ptr))
     {
       /* Tell threads waiting for refresh that something has happened */
       broadcast_refresh();
     }
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   }
 }
 
@@ -720,7 +720,7 @@
           /* The first time it is required, lock for close_thread_table(). */
           if (! did_lock && ! is_locked)
           {
-            VOID(pthread_mutex_lock(&LOCK_open));
+            (void)(pthread_mutex_lock(&LOCK_open));
             did_lock= TRUE;
           }
           mysql_ha_flush_table(thd, table_ptr, mode_flags);
@@ -744,7 +744,7 @@
         /* The first time it is required, lock for close_thread_table(). */
         if (! did_lock && ! is_locked)
         {
-          VOID(pthread_mutex_lock(&LOCK_open));
+          (void)(pthread_mutex_lock(&LOCK_open));
           did_lock= TRUE;
         }
         mysql_ha_flush_table(thd, table_ptr, mode_flags);
@@ -756,7 +756,7 @@
 
   /* Release the lock if it was taken by this function. */
   if (did_lock)
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
 
   DBUG_RETURN(0);
 }
===== sql/sql_insert.cc 1.295 vs edited =====
--- 1.295/sql/sql_insert.cc	2007-10-17 18:20:04 +02:00
+++ edited/sql/sql_insert.cc	2007-11-03 02:22:03 +01:00
@@ -1025,7 +1025,7 @@
 
   DBUG_ASSERT(view->table != 0 && view->field_translation != 0);
 
-  VOID(bitmap_init(&used_fields, used_fields_buff, table->s->fields, 0));
+  (void)(bitmap_init(&used_fields, used_fields_buff, table->s->fields, 0));
   bitmap_clear_all(&used_fields);
 
   view->contain_auto_increment= 0;
@@ -1713,9 +1713,9 @@
     pthread_mutex_init(&mutex,MY_MUTEX_INIT_FAST);
     pthread_cond_init(&cond,NULL);
     pthread_cond_init(&cond_client,NULL);
-    VOID(pthread_mutex_lock(&LOCK_thread_count));
+    (void)(pthread_mutex_lock(&LOCK_thread_count));
     delayed_insert_threads++;
-    VOID(pthread_mutex_unlock(&LOCK_thread_count));
+    (void)(pthread_mutex_unlock(&LOCK_thread_count));
   }
   ~Delayed_insert()
   {
@@ -1725,7 +1725,7 @@
       delete row;
     if (table)
       close_thread_tables(&thd);
-    VOID(pthread_mutex_lock(&LOCK_thread_count));
+    (void)(pthread_mutex_lock(&LOCK_thread_count));
     pthread_mutex_destroy(&mutex);
     pthread_cond_destroy(&cond);
     pthread_cond_destroy(&cond_client);
@@ -1734,8 +1734,8 @@
     thd.security_ctx->user= thd.security_ctx->host=0;
     thread_count--;
     delayed_insert_threads--;
-    VOID(pthread_mutex_unlock(&LOCK_thread_count));
-    VOID(pthread_cond_broadcast(&COND_thread_count)); /* Tell main we are ready */
+    (void)(pthread_mutex_unlock(&LOCK_thread_count));
+    (void)(pthread_cond_broadcast(&COND_thread_count)); /* Tell main we are ready */
   }
 
   /* The following is for checking when we can delete ourselves */
@@ -2199,7 +2199,7 @@
 
 void kill_delayed_threads(void)
 {
-  VOID(pthread_mutex_lock(&LOCK_delayed_insert)); // For unlink from list
+  (void)(pthread_mutex_lock(&LOCK_delayed_insert)); // For unlink from list
 
   I_List_iterator<Delayed_insert> it(delayed_threads);
   Delayed_insert *di;
@@ -2224,7 +2224,7 @@
       pthread_mutex_unlock(&di->thd.mysys_var->mutex);
     }
   }
-  VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
+  (void)(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list
 }
 
 
@@ -3374,7 +3374,7 @@
 
       if (!(create_info->options & HA_LEX_CREATE_TMP_TABLE))
       {
-        VOID(pthread_mutex_lock(&LOCK_open));
+        (void)(pthread_mutex_lock(&LOCK_open));
         if (reopen_name_locked_table(thd, create_table, FALSE))
         {
           quick_rm_table(create_info->db_type, create_table->db,
@@ -3383,7 +3383,7 @@
         }
         else
           table= create_table->table;
-        VOID(pthread_mutex_unlock(&LOCK_open));
+        (void)(pthread_mutex_unlock(&LOCK_open));
       }
       else
       {
===== sql/sql_map.cc 1.24 vs edited =====
--- 1.24/sql/sql_map.cc	2007-09-21 10:14:58 +02:00
+++ edited/sql/sql_map.cc	2007-11-03 02:22:04 +01:00
@@ -48,12 +48,12 @@
     if (map && memcmp(map,magic,magic_length))
     {
       my_error(ER_WRONG_MAGIC, MYF(0), name);
-      VOID(my_munmap((char*) map,(size_t)size));
+      (void)(my_munmap((char*) map,(size_t)size));
       map=0;
     }
     if (!map)
     {
-      VOID(my_close(file,MYF(0)));
+      (void)(my_close(file,MYF(0)));
       file= -1;
     }
   }
@@ -66,8 +66,8 @@
 #ifdef HAVE_MMAP
   if (file >= 0)
   {
-    VOID(my_munmap((char*) map,(size_t)size));
-    VOID(my_close(file,MYF(0)));
+    (void)(my_munmap((char*) map,(size_t)size));
+    (void)(my_close(file,MYF(0)));
     file= -1; map=0;
   }
   my_free(name,MYF(0));
@@ -85,7 +85,7 @@
 mapped_files *map_file(const char * name,uchar *magic,uint magic_length)
 {
 #ifdef HAVE_MMAP
-  VOID(pthread_mutex_lock(&LOCK_mapped_file));
+  (void)(pthread_mutex_lock(&LOCK_mapped_file));
   I_List_iterator<mapped_files> list(maps_in_use);
   mapped_files *map;
   char path[FN_REFLEN];
@@ -108,7 +108,7 @@
     if (!map->map)
       my_error(ER_NO_FILE_MAPPING, MYF(0), path, map->error);
   }
-  VOID(pthread_mutex_unlock(&LOCK_mapped_file));
+  (void)(pthread_mutex_unlock(&LOCK_mapped_file));
   return map;
 #else
   return NULL;
@@ -122,10 +122,10 @@
 void unmap_file(mapped_files *map)
 {
 #ifdef HAVE_MMAP
-  VOID(pthread_mutex_lock(&LOCK_mapped_file));
+  (void)(pthread_mutex_lock(&LOCK_mapped_file));
   if (!map->use_count--)
     delete map;
-  VOID(pthread_mutex_unlock(&LOCK_mapped_file));
+  (void)(pthread_mutex_unlock(&LOCK_mapped_file));
 #endif
 }
 
===== sql/sql_parse.cc 1.717 vs edited =====
--- 1.717/sql/sql_parse.cc	2007-10-18 22:39:08 +02:00
+++ edited/sql/sql_parse.cc	2007-11-03 02:22:04 +01:00
@@ -696,13 +696,13 @@
   thd->enable_slow_log= TRUE;
   thd->lex->sql_command= SQLCOM_END; /* to avoid confusing VIEW detectors */
   thd->set_time();
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
   thd->query_id= global_query_id;
   if (command != COM_STATISTICS && command != COM_PING)
     next_query_id();
   thread_running++;
   /* TODO: set thd->lex->sql_command to SQLCOM_END here */
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
 
   thd->server_status&=
            ~(SERVER_QUERY_NO_INDEX_USED | SERVER_QUERY_NO_GOOD_INDEX_USED);
@@ -910,13 +910,13 @@
         next_packet++;
         length--;
       }
-      VOID(pthread_mutex_lock(&LOCK_thread_count));
+      (void)(pthread_mutex_lock(&LOCK_thread_count));
       thd->query_length= length;
       thd->query= next_packet;
       thd->query_id= next_query_id();
       thd->set_time(); /* Reset the query start time. */
       /* TODO: set thd->lex->sql_command to SQLCOM_END here */
-      VOID(pthread_mutex_unlock(&LOCK_thread_count));
+      (void)(pthread_mutex_unlock(&LOCK_thread_count));
       mysql_parse(thd, next_packet, length, & found_semicolon);
     }
 
@@ -1173,8 +1173,8 @@
     }
 #endif
 #ifndef EMBEDDED_LIBRARY
-    VOID(my_net_write(net, (uchar*) buff, length));
-      VOID(net_flush(net));
+    (void)(my_net_write(net, (uchar*) buff, length));
+      (void)(net_flush(net));
 #endif
     break;
   }
@@ -1263,13 +1263,13 @@
   log_slow_statement(thd);
 
   THD_SET_PROC_INFO(thd, "cleaning up");
-  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list
+  (void)(pthread_mutex_lock(&LOCK_thread_count)); // For process list
   THD_SET_PROC_INFO(thd, 0);
   thd->command=COM_SLEEP;
   thd->query=0;
   thd->query_length=0;
   thread_running--;
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   thd->packet.shrink(thd->variables.net_buffer_length);	// Reclaim some memory
   free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
   DBUG_RETURN(error);
@@ -6404,7 +6404,7 @@
   uint error=ER_NO_SUCH_THREAD;
   DBUG_ENTER("kill_one_thread");
   DBUG_PRINT("enter", ("id=%lu only_kill=%d", id, only_kill_query));
-  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
+  (void)(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
   I_List_iterator<THD> it(threads);
   while ((tmp=it++))
   {
@@ -6416,7 +6416,7 @@
       break;
     }
   }
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   if (tmp)
   {
     if ((thd->security_ctx->master_access & SUPER_ACL) ||
===== sql/sql_select.cc 1.564 vs edited =====
--- 1.564/sql/sql_select.cc	2007-10-19 05:39:00 +02:00
+++ edited/sql/sql_select.cc	2007-11-03 02:22:04 +01:00
@@ -4700,7 +4700,7 @@
           keyuse.null_rejecting= key_field->null_rejecting;
           keyuse.cond_guard= key_field->cond_guard;
           keyuse.sj_pred_no= key_field->sj_pred_no;
-	  VOID(insert_dynamic(keyuse_array,(uchar*) &keyuse));
+	  (void)(insert_dynamic(keyuse_array,(uchar*) &keyuse));
 	}
       }
     }
@@ -4768,7 +4768,7 @@
   keyuse.optimize= 0;
   keyuse.keypart_map= 0;
   keyuse.sj_pred_no= UINT_MAX;
-  VOID(insert_dynamic(keyuse_array,(uchar*) &keyuse));
+  (void)(insert_dynamic(keyuse_array,(uchar*) &keyuse));
 }
 
 
@@ -4995,7 +4995,7 @@
 	  (qsort_cmp) sort_keyuse);
 
     bzero((char*) &key_end,sizeof(key_end));    /* Add for easy testing */
-    VOID(insert_dynamic(keyuse,(uchar*) &key_end));
+    (void)(insert_dynamic(keyuse,(uchar*) &key_end));
 
     use=save_pos=dynamic_element(keyuse,0,KEYUSE*);
     prev= &key_end;
@@ -5030,7 +5030,7 @@
       save_pos++;
     }
     i=(uint) (save_pos-(KEYUSE*) keyuse->buffer);
-    VOID(set_dynamic(keyuse,(uchar*) &key_end,i));
+    (void)(set_dynamic(keyuse,(uchar*) &key_end,i));
     keyuse->elements=i;
   }
   DBUG_EXECUTE("opt", print_keyuse_array(keyuse););
@@ -10692,7 +10692,7 @@
 	li.remove();
       else if (item != new_item)
       {
-	VOID(li.replace(new_item));
+	(void)(li.replace(new_item));
 	should_fix_fields=1;
       }
       if (*cond_value == Item::COND_UNDEF)
@@ -12910,7 +12910,7 @@
 
   if (table)
   {
-    VOID(table->file->extra(HA_EXTRA_WRITE_CACHE));
+    (void)(table->file->extra(HA_EXTRA_WRITE_CACHE));
     empty_record(table);
     if (table->group && join->tmp_table_param.sum_func_count &&
         table->s->keys && !table->file->inited)
@@ -14398,7 +14398,7 @@
       if (end_of_records)
 	DBUG_RETURN(NESTED_LOOP_OK);
       join->first_record=1;
-      VOID(test_if_group_changed(join->group_fields));
+      (void)(test_if_group_changed(join->group_fields));
     }
     if (idx < (int) join->send_group_parts)
     {
@@ -14666,7 +14666,7 @@
       if (end_of_records)
 	DBUG_RETURN(NESTED_LOOP_OK);
       join->first_record=1;
-      VOID(test_if_group_changed(join->group_fields));
+      (void)(test_if_group_changed(join->group_fields));
     }
     if (idx < (int) join->send_group_parts)
     {
===== sql/sql_servers.cc 1.14 vs edited =====
--- 1.14/sql/sql_servers.cc	2007-08-13 15:11:14 +02:00
+++ edited/sql/sql_servers.cc	2007-11-03 02:22:04 +01:00
@@ -659,7 +659,7 @@
                      server->server_name,
                      server->server_name_length));
 
-  VOID(hash_delete(&servers_cache, (uchar*) server));
+  (void)(hash_delete(&servers_cache, (uchar*) server));
   
   error= 0;
 
@@ -766,7 +766,7 @@
   /*
     delete the existing server struct from the server cache
   */
-  VOID(hash_delete(&servers_cache, (uchar*)existing));
+  (void)(hash_delete(&servers_cache, (uchar*)existing));
 
   /*
     Insert the altered server struct into the server cache
===== sql/sql_show.cc 1.436 vs edited =====
--- 1.436/sql/sql_show.cc	2007-10-08 00:08:40 +02:00
+++ edited/sql/sql_show.cc	2007-11-03 02:22:05 +01:00
@@ -561,7 +561,7 @@
   DBUG_PRINT("info",("found: %d files", files->elements));
   my_dirend(dirp);
 
-  VOID(ha_find_files(thd, db, path, wild, dir, files));
+  (void)(ha_find_files(thd, db, path, wild, dir, files));
 
   DBUG_RETURN(FIND_FILES_OK);
 }
@@ -864,7 +864,7 @@
    it's a keyword
   */
 
-  VOID(packet->reserve(length*2 + 2));
+  (void)(packet->reserve(length*2 + 2));
   quote_char= (char) q;
   packet->append(&quote_char, 1, system_charset_info);
 
@@ -1683,7 +1683,7 @@
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_VOID_RETURN;
 
-  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
+  (void)(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
   if (!thd->killed)
   {
     I_List_iterator<THD> it(threads);
@@ -1750,7 +1750,7 @@
       }
     }
   }
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
 
   thread_info *thd_info;
   time_t now= my_time(0);
@@ -1789,7 +1789,7 @@
   user= thd->security_ctx->master_access & PROCESS_ACL ?
         NullS : thd->security_ctx->priv_user;
 
-  VOID(pthread_mutex_lock(&LOCK_thread_count));
+  (void)(pthread_mutex_lock(&LOCK_thread_count));
 
   if (!thd->killed)
   {
@@ -1877,13 +1877,13 @@
 
       if (schema_table_store_record(thd, table))
       {
-        VOID(pthread_mutex_unlock(&LOCK_thread_count));
+        (void)(pthread_mutex_unlock(&LOCK_thread_count));
         DBUG_RETURN(1);
       }
     }
   }
 
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   DBUG_RETURN(0);
 }
 
@@ -2226,7 +2226,7 @@
   DBUG_ENTER("calc_sum_of_all_status");
 
   /* Ensure that thread id not killed during loop */
-  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
+  (void)(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
 
   I_List_iterator<THD> it(threads);
   THD *tmp;
@@ -2238,7 +2238,7 @@
   while ((tmp= it++))
     add_to_status(to, &tmp->status_var);
   
-  VOID(pthread_mutex_unlock(&LOCK_thread_count));
+  (void)(pthread_mutex_unlock(&LOCK_thread_count));
   DBUG_VOID_RETURN;
 }
 
@@ -2778,7 +2778,7 @@
         Check that table is relevant in current transaction.
         (used for ndb engine, see ndbcluster_find_files(), ha_ndbcluster.cc)
       */
-      VOID(ha_find_files(thd, db_name->str, path,
+      (void)(ha_find_files(thd, db_name->str, path,
                          lookup_field_vals->table_value.str, 0,
                          table_names));
     }
===== sql/sql_string.cc 1.108 vs edited =====
--- 1.108/sql/sql_string.cc	2007-08-27 00:38:34 +02:00
+++ edited/sql/sql_string.cc	2007-11-03 02:22:05 +01:00
@@ -122,7 +122,7 @@
   int decpt,sign;
   char *pos,*to;
 
-  VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
+  (void)(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
   if (!my_isdigit(&my_charset_latin1, buff[1]))
   {						// Nan or Inf
     pos=buff+1;
===== sql/sql_table.cc 1.412 vs edited =====
--- 1.412/sql/sql_table.cc	2007-09-26 17:49:05 +02:00
+++ edited/sql/sql_table.cc	2007-11-03 02:22:05 +01:00
@@ -196,9 +196,9 @@
   if (flags & FN_IS_TMP) // FN_FROM_IS_TMP | FN_TO_IS_TMP
     strnmov(tbbuff, table_name, sizeof(tbbuff));
   else
-    VOID(tablename_to_filename(table_name, tbbuff, sizeof(tbbuff)));
+    (void)(tablename_to_filename(table_name, tbbuff, sizeof(tbbuff)));
 
-  VOID(tablename_to_filename(db, dbbuff, sizeof(dbbuff)));
+  (void)(tablename_to_filename(db, dbbuff, sizeof(dbbuff)));
 
   char *end = buff + bufflen;
   /* Don't add FN_ROOTDIR if mysql_data_home already includes it */
@@ -391,7 +391,7 @@
     sql_print_error("Error writing ddl log header");
     DBUG_RETURN(TRUE);
   }
-  VOID(sync_ddl_log());
+  (void)(sync_ddl_log());
   DBUG_RETURN(error);
 }
 
@@ -459,7 +459,7 @@
   global_ddl_log.first_free= NULL;
   global_ddl_log.first_used= NULL;
   global_ddl_log.num_entries= 0;
-  VOID(pthread_mutex_init(&LOCK_gdl, MY_MUTEX_INIT_FAST));
+  (void)(pthread_mutex_init(&LOCK_gdl, MY_MUTEX_INIT_FAST));
   DBUG_RETURN(entry_no);
 }
 
@@ -540,7 +540,7 @@
   global_ddl_log.inited= TRUE;
   if (write_ddl_log_header())
   {
-    VOID(my_close(global_ddl_log.file_id, MYF(MY_WME)));
+    (void)(my_close(global_ddl_log.file_id, MYF(MY_WME)));
     global_ddl_log.inited= FALSE;
     DBUG_RETURN(TRUE);
   }
@@ -617,7 +617,7 @@
           }
 #ifdef WITH_PARTITION_STORAGE_ENGINE
           strxmov(to_path, ddl_log_entry->name, par_ext, NullS);
-          VOID(my_delete(to_path, MYF(MY_WME)));
+          (void)(my_delete(to_path, MYF(MY_WME)));
 #endif
         }
         else
@@ -630,7 +630,7 @@
         }
         if ((deactivate_ddl_log_entry(ddl_log_entry->entry_pos)))
           break;
-        VOID(sync_ddl_log());
+        (void)(sync_ddl_log());
         error= FALSE;
         if (ddl_log_entry->action_type == DDL_LOG_DELETE_ACTION)
           break;
@@ -654,7 +654,7 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
         strxmov(to_path, ddl_log_entry->name, par_ext, NullS);
         strxmov(from_path, ddl_log_entry->from_name, par_ext, NullS);
-        VOID(my_rename(from_path, to_path, MYF(MY_WME)));
+        (void)(my_rename(from_path, to_path, MYF(MY_WME)));
 #endif
       }
       else
@@ -665,7 +665,7 @@
       }
       if ((deactivate_ddl_log_entry(ddl_log_entry->entry_pos)))
         break;
-      VOID(sync_ddl_log());
+      (void)(sync_ddl_log());
       error= FALSE;
       break;
     }
@@ -794,7 +794,7 @@
   }
   if (write_header && !error)
   {
-    VOID(sync_ddl_log());
+    (void)(sync_ddl_log());
     if (write_ddl_log_header())
       error= TRUE;
   }
@@ -851,7 +851,7 @@
       any log entries before, we are only here to write the execute
       entry to indicate it is done.
     */
-    VOID(sync_ddl_log());
+    (void)(sync_ddl_log());
     file_entry_buf[DDL_LOG_ENTRY_TYPE_POS]= (char)DDL_LOG_EXECUTE_CODE;
   }
   else
@@ -875,7 +875,7 @@
     release_ddl_log_memory_entry(*active_entry);
     DBUG_RETURN(TRUE);
   }
-  VOID(sync_ddl_log());
+  (void)(sync_ddl_log());
   if (write_header)
   {
     if (write_ddl_log_header())
@@ -1067,7 +1067,7 @@
   DBUG_ENTER("close_ddl_log");
   if (global_ddl_log.file_id >= 0)
   {
-    VOID(my_close(global_ddl_log.file_id, MYF(MY_WME)));
+    (void)(my_close(global_ddl_log.file_id, MYF(MY_WME)));
     global_ddl_log.file_id= (File) -1;
   }
   DBUG_VOID_RETURN;
@@ -1127,7 +1127,7 @@
   }
   close_ddl_log();
   create_ddl_log_file_name(file_name);
-  VOID(my_delete(file_name, MYF(0)));
+  (void)(my_delete(file_name, MYF(0)));
   global_ddl_log.recovery_phase= FALSE;
   delete thd;
   /* Remember that we don't have a THD */
@@ -1166,7 +1166,7 @@
   close_ddl_log();
   global_ddl_log.inited= 0;
   pthread_mutex_unlock(&LOCK_gdl);
-  VOID(pthread_mutex_destroy(&LOCK_gdl));
+  (void)(pthread_mutex_destroy(&LOCK_gdl));
   DBUG_VOID_RETURN;
 }
 
@@ -1347,7 +1347,7 @@
       completing this we write a new phase to the log entry that will
       deactivate it.
     */
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     if (my_delete(frm_name, MYF(MY_WME)) ||
 #ifdef WITH_PARTITION_STORAGE_ENGINE
         lpt->table->file->create_handler_files(path, shadow_path,
@@ -1365,11 +1365,11 @@
     {
       error= 1;
     }
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
 #ifdef WITH_PARTITION_STORAGE_ENGINE
     deactivate_ddl_log_entry(part_info->frm_log_entry->entry_pos);
     part_info->frm_log_entry= NULL;
-    VOID(sync_ddl_log());
+    (void)(sync_ddl_log());
 #endif
   }
 
@@ -3381,7 +3381,7 @@
     goto err;
   }
 
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   if (!internal_tmp_table && !(create_info->options & HA_LEX_CREATE_TMP_TABLE))
   {
     if (!access(path,F_OK))
@@ -3479,7 +3479,7 @@
     write_bin_log(thd, TRUE, thd->query, thd->query_length);
   error= FALSE;
 unlock_and_end:
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
 
 err:
   THD_SET_PROC_INFO(thd, "After create");
@@ -3726,7 +3726,7 @@
                        table->s->table_name.str, (ulong) table->s,
                        table->db_stat, table->s->version));
 
-  VOID(table->file->extra(function));
+  (void)(table->file->extra(function));
   /* Mark all tables that are in use as 'old' */
   mysql_lock_abort(thd, table, TRUE);	/* end threads waiting on lock */
 
@@ -4548,14 +4548,14 @@
     Also some engines (e.g. NDB cluster) require that LOCK_open should be held
     during the call to ha_create_table(). See bug #28614 for more info.
   */
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   if (my_copy(src_path, dst_path, MYF(MY_DONT_OVERWRITE_FILE)))
   {
     if (my_errno == ENOENT)
       my_error(ER_BAD_DB_ERROR,MYF(0),db);
     else
       my_error(ER_CANT_CREATE_FILE,MYF(0),dst_path,my_errno);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     goto err;
   }
 
@@ -4584,7 +4584,7 @@
   if (thd->variables.keep_files_on_create)
     create_info->options|= HA_CREATE_KEEP_FILES;
   err= ha_create_table(thd, dst_path, db, table_name, create_info, 1);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
 
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
   {
@@ -4641,13 +4641,13 @@
           of this function.
         */
         table->table= name_lock;
-        VOID(pthread_mutex_lock(&LOCK_open));
+        (void)(pthread_mutex_lock(&LOCK_open));
         if (reopen_name_locked_table(thd, table, FALSE))
         {
-          VOID(pthread_mutex_unlock(&LOCK_open));
+          (void)(pthread_mutex_unlock(&LOCK_open));
           goto err;
         }
-        VOID(pthread_mutex_unlock(&LOCK_open));
+        (void)(pthread_mutex_unlock(&LOCK_open));
 
         IF_DBUG(int result=) store_create_info(thd, table, &query,
                                                create_info);
@@ -5493,7 +5493,7 @@
     The final .frm file is already created as a temporary file
     and will be renamed to the original table name.
   */
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
   alter_table_manage_keys(table, table->file->indexes_are_disabled(),
                           keys_onoff);
@@ -5507,11 +5507,11 @@
                          table->s->table_name.str, FN_FROM_IS_TMP))
   {
     error= 1;
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     goto err;
   }
   broadcast_refresh();
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
 
   /*
     The ALTER TABLE is always in its own transaction.
@@ -5527,13 +5527,13 @@
     goto err;
   if (online)
   {
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     if (reopen_table(table))
     {
       error= -1;
       goto err;
     }
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     t_table= table;
 
    /*
@@ -5552,9 +5552,9 @@
     */
     DBUG_ASSERT(t_table == table);
     table->open_placeholder= 1;
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     close_handle_and_leave_table_as_lock(table);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
   }
 
  err:
@@ -6136,7 +6136,7 @@
 
     if (wait_if_global_read_lock(thd,0,1))
       DBUG_RETURN(TRUE);
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     if (lock_table_names(thd, table_list))
     {
       error= 1;
@@ -6289,17 +6289,17 @@
         while the fact that the table is still open gives us protection
         from concurrent DDL statements.
       */
-      VOID(pthread_mutex_lock(&LOCK_open));
+      (void)(pthread_mutex_lock(&LOCK_open));
       wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
-      VOID(pthread_mutex_unlock(&LOCK_open));
+      (void)(pthread_mutex_unlock(&LOCK_open));
       DBUG_EXECUTE_IF("sleep_alter_enable_indexes", my_sleep(6000000););
       error= table->file->enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
       /* COND_refresh will be signaled in close_thread_tables() */
       break;
     case DISABLE:
-      VOID(pthread_mutex_lock(&LOCK_open));
+      (void)(pthread_mutex_lock(&LOCK_open));
       wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
-      VOID(pthread_mutex_unlock(&LOCK_open));
+      (void)(pthread_mutex_unlock(&LOCK_open));
       error=table->file->disable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
       /* COND_refresh will be signaled in close_thread_tables() */
       break;
@@ -6316,7 +6316,7 @@
 			  table->alias);
     }
 
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     /*
       Unlike to the above case close_cached_table() below will remove ALL
       instances of TABLE from table cache (it will also remove table lock
@@ -6355,7 +6355,7 @@
         else if (Table_triggers_list::change_table_name(thd, db, table_name,
                                                         new_db, new_alias))
       {
-          VOID(mysql_rename_table(old_db_type, new_db, new_alias, db,
+          (void)(mysql_rename_table(old_db_type, new_db, new_alias, db,
                                   table_name, 0));
           error= -1;
       }
@@ -6382,7 +6382,7 @@
     }
     if (name_lock)
       unlink_open_table(thd, name_lock, FALSE);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     table_list->table= NULL;                    // For query cache
     query_cache_invalidate3(thd, table_list, 0);
     DBUG_RETURN(error);
@@ -6633,9 +6633,9 @@
   }
   else
   {
-    VOID(pthread_mutex_lock(&LOCK_open));
+    (void)(pthread_mutex_lock(&LOCK_open));
     wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN);
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     alter_table_manage_keys(table, table->file->indexes_are_disabled(),
                             alter_info->keys_onoff);
     error= ha_commit_stmt(thd);
@@ -6672,11 +6672,11 @@
     intern_close_table(new_table);
     my_free(new_table,MYF(0));
   }
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   if (error)
   {
-    VOID(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     goto err;
   }
 
@@ -6725,7 +6725,7 @@
                          FN_TO_IS_TMP))
   {
     error=1;
-    VOID(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
+    (void)(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
   }
   else if (mysql_rename_table(new_db_type, new_db, tmp_name, new_db,
                               new_alias, FN_FROM_IS_TMP) ||
@@ -6735,9 +6735,9 @@
   {
     /* Try to get everything back. */
     error=1;
-    VOID(quick_rm_table(new_db_type,new_db,new_alias, 0));
-    VOID(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
-    VOID(mysql_rename_table(old_db_type, db, old_name, db, alias,
+    (void)(quick_rm_table(new_db_type,new_db,new_alias, 0));
+    (void)(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
+    (void)(mysql_rename_table(old_db_type, db, old_name, db, alias,
                             FN_FROM_IS_TMP));
   }
 
@@ -6747,7 +6747,7 @@
     goto err_with_placeholders;
   }
 
-  VOID(quick_rm_table(old_db_type, db, old_name, FN_IS_TMP));
+  (void)(quick_rm_table(old_db_type, db, old_name, FN_IS_TMP));
 
 end_online:
 
@@ -6759,7 +6759,7 @@
     if (error)
       goto err_with_placeholders;
   }
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
 
   THD_SET_PROC_INFO(thd, "end");
 
@@ -6827,7 +6827,7 @@
     close_temporary_table(thd, new_table, 1, 1);
   }
   else
-    VOID(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
+    (void)(quick_rm_table(new_db_type, new_db, tmp_name, FN_IS_TMP));
 
 err:
   /*
@@ -6879,7 +6879,7 @@
   unlink_open_table(thd, table, FALSE);
   if (name_lock)
     unlink_open_table(thd, name_lock, FALSE);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(TRUE);
 }
 /* mysql_alter_table */
===== sql/sql_test.cc 1.56 vs edited =====
--- 1.56/sql/sql_test.cc	2007-08-25 21:13:39 +02:00
+++ edited/sql/sql_test.cc	2007-11-03 02:22:05 +01:00
@@ -74,7 +74,7 @@
   TABLE *start_link,*lnk;
 
   /* purecov: begin tested */
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   puts("DB             Table                            Version  Thread  Open  Lock");
 
   for (idx=unused=0 ; idx < open_cache.records ; idx++)
@@ -110,7 +110,7 @@
   if (hash_check(&open_cache))
     printf("Error: File hash table is corrupted\n");
   fflush(stdout);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   /* purecov: end */
   return;
 }
@@ -149,7 +149,7 @@
   }
   out.append('\0');				// Purify doesn't like c_ptr()
   DBUG_LOCK_FILE;
-  VOID(fputs("\nInfo about FILESORT\n",DBUG_FILE));
+  (void)(fputs("\nInfo about FILESORT\n",DBUG_FILE));
   fprintf(DBUG_FILE,"Sortorder: %s\n",out.ptr());
   DBUG_UNLOCK_FILE;
   DBUG_VOID_RETURN;
@@ -163,7 +163,7 @@
   DBUG_ENTER("TEST_join");
 
   DBUG_LOCK_FILE;
-  VOID(fputs("\nInfo about JOIN\n",DBUG_FILE));
+  (void)(fputs("\nInfo about JOIN\n",DBUG_FILE));
   for (i=0 ; i < join->tables ; i++)
   {
     JOIN_TAB *tab=join->join_tab+i;
@@ -189,17 +189,17 @@
         tab->select->quick->dbug_dump(18, FALSE);
       }
       else
-	VOID(fputs("                  select used\n",DBUG_FILE));
+	(void)(fputs("                  select used\n",DBUG_FILE));
     }
     if (tab->ref.key_parts)
     {
-      VOID(fputs("                  refs: ",DBUG_FILE));
+      (void)(fputs("                  refs: ",DBUG_FILE));
       for (ref=0 ; ref < tab->ref.key_parts ; ref++)
       {
 	Item *item=tab->ref.items[ref];
 	fprintf(DBUG_FILE,"%s  ", item->full_name());
       }
-      VOID(fputc('\n',DBUG_FILE));
+      (void)(fputc('\n',DBUG_FILE));
     }
   }
   DBUG_UNLOCK_FILE;
@@ -385,7 +385,7 @@
       table_lock_info.lock_text=text;
       // lock_type is also obtainable from THR_LOCK_DATA
       table_lock_info.type=table->reginfo.lock_type;
-      VOID(push_dynamic(ar,(uchar*) &table_lock_info));
+      (void)(push_dynamic(ar,(uchar*) &table_lock_info));
     }
   }
 }
@@ -410,13 +410,13 @@
   LIST *list;
   DYNAMIC_ARRAY saved_table_locks;
 
-  VOID(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50));
-  VOID(pthread_mutex_lock(&THR_LOCK_lock));
+  (void)(my_init_dynamic_array(&saved_table_locks,sizeof(TABLE_LOCK_INFO),open_cache.records + 20,50));
+  (void)(pthread_mutex_lock(&THR_LOCK_lock));
   for (list= thr_lock_thread_list; list; list= list_rest(list))
   {
     THR_LOCK *lock=(THR_LOCK*) list->data;
 
-    VOID(pthread_mutex_lock(&lock->mutex));
+    (void)(pthread_mutex_lock(&lock->mutex));
     push_locks_into_array(&saved_table_locks, lock->write.data, FALSE,
 			  "Locked - write");
     push_locks_into_array(&saved_table_locks, lock->write_wait.data, TRUE,
@@ -425,9 +425,9 @@
 			  "Locked - read");
     push_locks_into_array(&saved_table_locks, lock->read_wait.data, TRUE,
 			  "Waiting - read");
-    VOID(pthread_mutex_unlock(&lock->mutex));
+    (void)(pthread_mutex_unlock(&lock->mutex));
   }
-  VOID(pthread_mutex_unlock(&THR_LOCK_lock));
+  (void)(pthread_mutex_unlock(&THR_LOCK_lock));
   if (!saved_table_locks.elements) goto end;
   
   qsort((uchar*) dynamic_element(&saved_table_locks,0,TABLE_LOCK_INFO *),saved_table_locks.elements,sizeof(TABLE_LOCK_INFO),(qsort_cmp) dl_compare);
@@ -492,7 +492,7 @@
 
   calc_sum_of_all_status(&tmp);
   printf("\nStatus information:\n\n");
-  VOID(my_getwd(current_dir, sizeof(current_dir),MYF(0)));
+  (void)(my_getwd(current_dir, sizeof(current_dir),MYF(0)));
   printf("Current dir: %s\n", current_dir);
   printf("Running threads: %d  Stack size: %ld\n", thread_count,
 	 (long) thread_stack);
===== sql/sql_trigger.cc 1.67 vs edited =====
--- 1.67/sql/sql_trigger.cc	2007-09-05 00:57:10 +02:00
+++ edited/sql/sql_trigger.cc	2007-11-03 02:22:05 +01:00
@@ -380,7 +380,7 @@
   if (wait_if_global_read_lock(thd, 0, 1))
     DBUG_RETURN(TRUE);
 
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
 
   if (!create)
   {
@@ -469,7 +469,7 @@
     write_bin_log(thd, TRUE, stmt_query.ptr(), stmt_query.length());
   }
 
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   start_waiting_global_read_lock(thd);
 
   if (!result)
===== sql/sql_update.cc 1.231 vs edited =====
--- 1.231/sql/sql_update.cc	2007-09-27 22:36:57 +02:00
+++ edited/sql/sql_update.cc	2007-11-03 02:22:05 +01:00
@@ -779,7 +779,7 @@
   end_read_record(&info);
   delete select;
   THD_SET_PROC_INFO(thd, "end");
-  VOID(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY));
+  (void)(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY));
 
   /*
     Invalidate the table in the query cache if something changed.
@@ -1747,7 +1747,7 @@
          todo/fixme: do_update() is never called with the arg 1.
          should it change the signature to become argless?
       */
-      VOID(do_updates(0));
+      (void)(do_updates(0));
     }
   }
   if (thd->transaction.stmt.modified_non_trans_table)
===== sql/sql_view.cc 1.127 vs edited =====
--- 1.127/sql/sql_view.cc	2007-09-14 11:17:55 +02:00
+++ edited/sql/sql_view.cc	2007-11-03 02:22:05 +01:00
@@ -550,7 +550,7 @@
     res= TRUE;
     goto err;
   }
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   res= mysql_register_view(thd, view, mode);
 
   if (mysql_bin_log.is_open())
@@ -595,7 +595,7 @@
                       buff.ptr(), buff.length(), FALSE, FALSE);
   }
 
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   if (view->revision != 1)
     query_cache_invalidate3(thd, view, 0);
   start_waiting_global_read_lock(thd);
@@ -1464,7 +1464,7 @@
   enum legacy_db_type not_used;
   DBUG_ENTER("mysql_drop_view");
 
-  VOID(pthread_mutex_lock(&LOCK_open));
+  (void)(pthread_mutex_lock(&LOCK_open));
   for (view= views; view; view= view->next_local)
   {
     TABLE_SHARE *share;
@@ -1522,19 +1522,19 @@
 
   if (error)
   {
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     DBUG_RETURN(TRUE);
   }
   if (wrong_object_name)
   {
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name, 
              "VIEW");
     DBUG_RETURN(TRUE);
   }
   if (non_existant_views.length())
   {
-    VOID(pthread_mutex_unlock(&LOCK_open));
+    (void)(pthread_mutex_unlock(&LOCK_open));
     my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());
     DBUG_RETURN(TRUE);
   }
@@ -1542,7 +1542,7 @@
   write_bin_log(thd, TRUE, thd->query, thd->query_length);
 
   send_ok(thd);
-  VOID(pthread_mutex_unlock(&LOCK_open));
+  (void)(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(FALSE);
 }
 
===== sql/table.cc 1.307 vs edited =====
--- 1.307/sql/table.cc	2007-09-28 17:52:06 +02:00
+++ edited/sql/table.cc	2007-11-03 02:22:06 +01:00
@@ -675,7 +675,7 @@
   error= 3;
   if (!(pos=get_form_pos(file,head,(TYPELIB*) 0)))
     goto err;                                   /* purecov: inspected */
-  VOID(my_seek(file,pos,MY_SEEK_SET,MYF(0)));
+  (void)(my_seek(file,pos,MY_SEEK_SET,MYF(0)));
   if (my_read(file,forminfo,288,MYF(MY_NABP)))
     goto err;
 
@@ -742,7 +742,7 @@
 
   /* Read keyinformation */
   key_info_length= (uint) uint2korr(head+28);
-  VOID(my_seek(file,(ulong) uint2korr(head+6),MY_SEEK_SET,MYF(0)));
+  (void)(my_seek(file,(ulong) uint2korr(head+6),MY_SEEK_SET,MYF(0)));
   if (read_string(file,(uchar**) &disk_buff,key_info_length))
     goto err;                                   /* purecov: inspected */
   if (disk_buff[0] & 0x80)
@@ -1075,7 +1075,7 @@
                record_offset, MYF(MY_NABP)))
     goto err;                                   /* purecov: inspected */
 
-  VOID(my_seek(file,pos+288,MY_SEEK_SET,MYF(0)));
+  (void)(my_seek(file,pos+288,MY_SEEK_SET,MYF(0)));
 #ifdef HAVE_CRYPTED_FRM
   if (crypted)
   {
@@ -2100,7 +2100,7 @@
   if (names)
   {
     length=uint2korr(head+4);
-    VOID(my_seek(file,64L,MY_SEEK_SET,MYF(0)));
+    (void)(my_seek(file,64L,MY_SEEK_SET,MYF(0)));
     if (!(buf= (uchar*) my_malloc((size_t) length+a_length+names*4,
 				  MYF(MY_WME))) ||
 	my_read(file, buf+a_length, (size_t) (length+names*4),
@@ -2179,17 +2179,17 @@
 
     while (endpos > maxlength)
     {
-      VOID(my_seek(file,(ulong) (endpos-bufflength),MY_SEEK_SET,MYF(0)));
+      (void)(my_seek(file,(ulong) (endpos-bufflength),MY_SEEK_SET,MYF(0)));
       if (my_read(file, buff, bufflength, MYF(MY_NABP+MY_WME)))
 	DBUG_RETURN(0L);
-      VOID(my_seek(file,(ulong) (endpos-bufflength+IO_SIZE),MY_SEEK_SET,
+      (void)(my_seek(file,(ulong) (endpos-bufflength+IO_SIZE),MY_SEEK_SET,
 		   MYF(0)));
       if ((my_write(file, buff,bufflength,MYF(MY_NABP+MY_WME))))
 	DBUG_RETURN(0);
       endpos-=bufflength; bufflength=IO_SIZE;
     }
     bzero(buff,IO_SIZE);			/* Null new block */
-    VOID(my_seek(file,(ulong) maxlength,MY_SEEK_SET,MYF(0)));
+    (void)(my_seek(file,(ulong) maxlength,MY_SEEK_SET,MYF(0)));
     if (my_write(file,buff,bufflength,MYF(MY_NABP+MY_WME)))
 	DBUG_RETURN(0L);
     maxlength+=IO_SIZE;				/* Fix old ref */
@@ -2205,11 +2205,11 @@
   if (n_length == 1 )
   {						/* First name */
     length++;
-    VOID(strxmov((char*) buff,"/",newname,"/",NullS));
+    (void)(strxmov((char*) buff,"/",newname,"/",NullS));
   }
   else
-    VOID(strxmov((char*) buff,newname,"/",NullS)); /* purecov: inspected */
-  VOID(my_seek(file,63L+(ulong) n_length,MY_SEEK_SET,MYF(0)));
+    (void)(strxmov((char*) buff,newname,"/",NullS)); /* purecov: inspected */
+  (void)(my_seek(file,63L+(ulong) n_length,MY_SEEK_SET,MYF(0)));
   if (my_write(file, buff, (size_t) length+1,MYF(MY_NABP+MY_WME)) ||
       (names && my_write(file,(uchar*) (*formnames->type_names+n_length-1),
 			 names*4, MYF(MY_NABP+MY_WME))) ||
@@ -2218,7 +2218,7 @@
 
   int2store(fileinfo+8,names+1);
   int2store(fileinfo+4,n_length+length);
-  VOID(my_chsize(file, newpos, 0, MYF(MY_WME)));/* Append file with '\0' */
+  (void)(my_chsize(file, newpos, 0, MYF(MY_WME)));/* Append file with '\0' */
   DBUG_RETURN(newpos);
 } /* make_new_entry */
 
@@ -2575,8 +2575,8 @@
     {
       if (my_write(file,fill, IO_SIZE, MYF(MY_WME | MY_NABP)))
       {
-	VOID(my_close(file,MYF(0)));
-	VOID(my_delete(name,MYF(0)));
+	(void)(my_close(file,MYF(0)));
+	(void)(my_delete(name,MYF(0)));
 	return(-1);
       }
     }
@@ -2615,8 +2615,8 @@
 rename_file_ext(const char * from,const char * to,const char * ext)
 {
   char from_b[FN_REFLEN],to_b[FN_REFLEN];
-  VOID(strxmov(from_b,from,ext,NullS));
-  VOID(strxmov(to_b,to,ext,NullS));
+  (void)(strxmov(from_b,from,ext,NullS));
+  (void)(strxmov(to_b,to,ext,NullS));
   return (my_rename(from_b,to_b,MYF(MY_WME)));
 }
 
===== sql/tztime.cc 1.58 vs edited =====
--- 1.58/sql/tztime.cc	2007-08-13 15:11:14 +02:00
+++ edited/sql/tztime.cc	2007-11-03 02:22:06 +01:00
@@ -1591,7 +1591,7 @@
     goto end;
   }
   init_alloc_root(&tz_storage, 32 * 1024, 0);
-  VOID(pthread_mutex_init(&tz_LOCK, MY_MUTEX_INIT_FAST));
+  (void)(pthread_mutex_init(&tz_LOCK, MY_MUTEX_INIT_FAST));
   tz_inited= 1;
 
   /* Add 'SYSTEM' time zone to tz_names hash */
@@ -1769,7 +1769,7 @@
   if (tz_inited)
   {
     tz_inited= 0;
-    VOID(pthread_mutex_destroy(&tz_LOCK));
+    (void)(pthread_mutex_destroy(&tz_LOCK));
     hash_free(&offset_tzs);
     hash_free(&tz_names);
     free_root(&tz_storage, MYF(0));
@@ -2230,7 +2230,7 @@
   if (!name)
     DBUG_RETURN(0);
 
-  VOID(pthread_mutex_lock(&tz_LOCK));
+  (void)(pthread_mutex_lock(&tz_LOCK));
 
   if (!str_to_offset(name->ptr(), name->length(), &offset))
   {
@@ -2272,7 +2272,7 @@
     }
   }
 
-  VOID(pthread_mutex_unlock(&tz_LOCK));
+  (void)(pthread_mutex_unlock(&tz_LOCK));
 
   DBUG_RETURN(result_tz);
 }
===== sql/udf_example.c 1.43 vs edited =====
--- 1.43/sql/udf_example.c	2007-10-19 05:39:00 +02:00
+++ edited/sql/udf_example.c	2007-11-03 17:01:32 +01:00
@@ -764,14 +764,14 @@
     return 0;
   }
 #else
-  VOID(pthread_mutex_lock(&LOCK_hostname));
+  (void)pthread_mutex_lock(&LOCK_hostname);
   if (!(hostent= gethostbyname((char*) name_buff)))
   {
-    VOID(pthread_mutex_unlock(&LOCK_hostname));
+    (void)pthread_mutex_unlock(&LOCK_hostname);
     *null_value= 1;
     return 0;
   }
-  VOID(pthread_mutex_unlock(&LOCK_hostname));
+  (void)pthread_mutex_unlock(&LOCK_hostname);
 #endif
   memcpy_fixed((char*) &in,(char*) *hostent->h_addr_list, sizeof(in.s_addr));
   *res_length= (ulong) (strmov(result, inet_ntoa(in)) - result);
@@ -868,14 +868,14 @@
     return 0;
   }
 #else
-  VOID(pthread_mutex_lock(&LOCK_hostname));
+  (void)pthread_mutex_lock(&LOCK_hostname);
   if (!(hp= gethostbyaddr((char*) &taddr, sizeof(taddr), AF_INET)))
   {
-    VOID(pthread_mutex_unlock(&LOCK_hostname));
+    (void)pthread_mutex_unlock(&LOCK_hostname);
     *null_value= 1;
     return 0;
   }
-  VOID(pthread_mutex_unlock(&LOCK_hostname));
+  (void)pthread_mutex_unlock(&LOCK_hostname);
 #endif
   *res_length=(ulong) (strmov(result,hp->h_name) - result);
   return result;
===== sql/uniques.cc 1.30 vs edited =====
--- 1.30/sql/uniques.cc	2007-07-04 10:40:10 +02:00
+++ edited/sql/uniques.cc	2007-11-03 02:22:06 +01:00
@@ -66,7 +66,7 @@
   */
   max_elements= (ulong) (max_in_memory_size /
                          ALIGN_SIZE(sizeof(TREE_ELEMENT)+size));
-  VOID(open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE,
+  (void)(open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE,
 		   MYF(MY_WME)));
 }
 
===== sql/unireg.cc 1.107 vs edited =====
--- 1.107/sql/unireg.cc	2007-08-27 09:05:30 +02:00
+++ edited/sql/unireg.cc	2007-11-03 02:22:06 +01:00
@@ -206,7 +206,7 @@
   key_buff_length= uint4korr(fileinfo+47);
   keybuff=(uchar*) my_malloc(key_buff_length, MYF(0));
   key_info_length= pack_keys(keybuff, keys, key_info, data_offset);
-  VOID(get_form_pos(file,fileinfo,&formnames));
+  (void)(get_form_pos(file,fileinfo,&formnames));
   if (!(filepos=make_new_entry(file,fileinfo,&formnames,"")))
     goto err;
   maxlength=(uint) next_io_size((ulong) (uint2korr(forminfo)+1000));
@@ -230,7 +230,7 @@
       my_pwrite(file, keybuff, key_info_length,
 		(ulong) uint2korr(fileinfo+6),MYF_RW))
     goto err;
-  VOID(my_seek(file,
+  (void)(my_seek(file,
 	       (ulong) uint2korr(fileinfo+6)+ (ulong) key_buff_length,
 	       MY_SEEK_SET,MYF(0)));
   if (make_empty_rec(thd,file,ha_legacy_type(create_info->db_type),
@@ -327,7 +327,7 @@
       }
     }
   }
-  VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
+  (void)(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
   if (my_write(file, forminfo, 288, MYF_RW) ||
       my_write(file, screen_buff, info_length, MYF_RW) ||
       pack_fields(file, create_fields, data_offset))
@@ -341,7 +341,7 @@
     if (!crypted || my_pwrite(file,&tmp,1,26,MYF_RW))	// Mark crypted
       goto err;
     uint read_length=uint2korr(forminfo)-256;
-    VOID(my_seek(file,filepos+256,MY_SEEK_SET,MYF(0)));
+    (void)(my_seek(file,filepos+256,MY_SEEK_SET,MYF(0)));
     if (read_string(file,(uchar**) &disk_buff,read_length))
       goto err;
     crypted->encode(disk_buff,read_length);
@@ -386,7 +386,7 @@
   my_free(screen_buff, MYF(0));
   my_free(keybuff, MYF(0));
 err2:
-  VOID(my_close(file,MYF(MY_WME)));
+  (void)(my_close(file,MYF(MY_WME)));
 err3:
   my_delete(file_name,MYF(0));
   DBUG_RETURN(1);
@@ -440,7 +440,7 @@
   DBUG_RETURN(0);
 
 err_handler:
-  VOID(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));
+  (void)(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));
   my_delete(frm_name, MYF(0));
   DBUG_RETURN(1);
 } /* rea_create_table */
===== storage/archive/azio.c 1.24 vs edited =====
--- 1.24/storage/archive/azio.c	2007-10-16 23:15:10 +02:00
+++ edited/storage/archive/azio.c	2007-11-03 17:02:36 +01:00
@@ -704,8 +704,8 @@
   if (s->mode == 'w')
     return 1;
 
-  VOID(pthread_cond_init(&s->container.threshhold, NULL));
-  VOID(pthread_mutex_init(&s->container.thresh_mutex, NULL));
+  (void)pthread_cond_init(&s->container.threshhold, NULL);
+  (void)pthread_mutex_init(&s->container.thresh_mutex, NULL);
   azio_start(s);
 
   s->aio= 1;
@@ -717,8 +717,8 @@
 {
   azio_kill(s);
 
-  VOID(pthread_mutex_destroy(&s->container.thresh_mutex));
-  VOID(pthread_cond_destroy(&s->container.threshhold));
+  (void)pthread_mutex_destroy(&s->container.thresh_mutex);
+  (void)pthread_cond_destroy(&s->container.threshhold);
 
   s->aio= 0;
 }
===== storage/archive/ha_archive.cc 1.149 vs edited =====
--- 1.149/storage/archive/ha_archive.cc	2007-10-16 23:15:10 +02:00
+++ edited/storage/archive/ha_archive.cc	2007-11-03 02:21:54 +01:00
@@ -180,7 +180,7 @@
   if (hash_init(&archive_open_tables, system_charset_info, 32, 0, 0,
                 (hash_get_key) archive_get_key, 0, 0))
   {
-    VOID(pthread_mutex_destroy(&archive_mutex));
+    (void)(pthread_mutex_destroy(&archive_mutex));
   }
   else
   {
@@ -204,7 +204,7 @@
 int archive_db_done(void *p)
 {
   hash_free(&archive_open_tables);
-  VOID(pthread_mutex_destroy(&archive_mutex));
+  (void)(pthread_mutex_destroy(&archive_mutex));
 
   return 0;
 }
@@ -323,7 +323,7 @@
     /*
       We will use this lock for rows.
     */
-    VOID(pthread_mutex_init(&share->mutex,MY_MUTEX_INIT_FAST));
+    (void)(pthread_mutex_init(&share->mutex,MY_MUTEX_INIT_FAST));
     
     /*
       We read the meta file, but do not mark it dirty. Since we are not
@@ -333,7 +333,7 @@
     */
     if (!(azopen(&archive_tmp, share->data_file_name, O_RDONLY|O_BINARY)))
     {
-      VOID(pthread_mutex_destroy(&share->mutex));
+      (void)(pthread_mutex_destroy(&share->mutex));
       free(share);
       pthread_mutex_unlock(&archive_mutex);
       *rc= HA_ERR_CRASHED_ON_REPAIR;
@@ -349,7 +349,7 @@
     }
     azclose(&archive_tmp);
 
-    VOID(my_hash_insert(&archive_open_tables, (uchar*) share));
+    (void)(my_hash_insert(&archive_open_tables, (uchar*) share));
     thr_lock_init(&share->lock);
   }
   share->use_count++;
@@ -382,7 +382,7 @@
   {
     hash_delete(&archive_open_tables, (uchar*) share);
     thr_lock_delete(&share->lock);
-    VOID(pthread_mutex_destroy(&share->mutex));
+    (void)(pthread_mutex_destroy(&share->mutex));
     /* 
       We need to make sure we don't reset the crashed state.
       If we open a crashed file, wee need to close it as crashed unless
@@ -1382,7 +1382,7 @@
   {
     MY_STAT file_stat;  // Stat information for the data file
 
-    VOID(my_stat(share->data_file_name, &file_stat, MYF(MY_WME)));
+    (void)(my_stat(share->data_file_name, &file_stat, MYF(MY_WME)));
 
     stats.mean_rec_length= table->s->reclength + buffer.alloced_length();
     stats.data_file_length= file_stat.st_size;
===== storage/blackhole/ha_blackhole.cc 1.55 vs edited =====
--- 1.55/storage/blackhole/ha_blackhole.cc	2007-08-13 15:11:15 +02:00
+++ edited/storage/blackhole/ha_blackhole.cc	2007-11-03 02:21:54 +01:00
@@ -303,7 +303,7 @@
   blackhole_hton->create= blackhole_create_handler;
   blackhole_hton->flags= HTON_CAN_RECREATE;
   
-  VOID(pthread_mutex_init(&blackhole_mutex, MY_MUTEX_INIT_FAST));
+  (void)(pthread_mutex_init(&blackhole_mutex, MY_MUTEX_INIT_FAST));
   (void) hash_init(&blackhole_open_tables, system_charset_info,32,0,0,
                    (hash_get_key) blackhole_get_key,
                    (hash_free_key) blackhole_free_key, 0);
===== storage/csv/ha_tina.cc 1.85 vs edited =====
--- 1.85/storage/csv/ha_tina.cc	2007-10-18 23:48:00 +02:00
+++ edited/storage/csv/ha_tina.cc	2007-11-03 02:21:55 +01:00
@@ -108,7 +108,7 @@
   handlerton *tina_hton;
 
   tina_hton= (handlerton *)p;
-  VOID(pthread_mutex_init(&tina_mutex,MY_MUTEX_INIT_FAST));
+  (void)(pthread_mutex_init(&tina_mutex,MY_MUTEX_INIT_FAST));
   (void) hash_init(&tina_open_tables,system_charset_info,32,0,0,
                    (hash_get_key) tina_get_key,0,0);
   tina_hton->state= SHOW_OPTION_YES;
@@ -239,7 +239,7 @@
 
   DBUG_ENTER("ha_tina::read_meta_file");
 
-  VOID(my_seek(meta_file, 0, MY_SEEK_SET, MYF(0)));
+  (void)(my_seek(meta_file, 0, MY_SEEK_SET, MYF(0)));
   if (my_read(meta_file, (uchar*)meta_buffer, META_BUFFER_SIZE, 0)
       != META_BUFFER_SIZE)
     DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
@@ -308,7 +308,7 @@
   ptr+= 3*sizeof(ulonglong);
   *ptr= (uchar)dirty;
 
-  VOID(my_seek(meta_file, 0, MY_SEEK_SET, MYF(0)));
+  (void)(my_seek(meta_file, 0, MY_SEEK_SET, MYF(0)));
   if (my_write(meta_file, (uchar *)meta_buffer, META_BUFFER_SIZE, 0)
       != META_BUFFER_SIZE)
     DBUG_RETURN(-1);
===== storage/csv/transparent_file.cc 1.2 vs edited =====
--- 1.2/storage/csv/transparent_file.cc	2007-05-10 11:59:31 +02:00
+++ edited/storage/csv/transparent_file.cc	2007-11-03 02:21:55 +01:00
@@ -35,7 +35,7 @@
   filedes= filedes_arg;
   /* read the beginning of the file */
   lower_bound= 0;
-  VOID(my_seek(filedes, 0, MY_SEEK_SET, MYF(0)));
+  (void)(my_seek(filedes, 0, MY_SEEK_SET, MYF(0)));
   if (filedes && buff)
     upper_bound= my_read(filedes, buff, buff_size, MYF(0));
 }
@@ -85,7 +85,7 @@
   if ((lower_bound <= offset) && (offset < upper_bound))
     return buff[offset - lower_bound];
 
-  VOID(my_seek(filedes, offset, MY_SEEK_SET, MYF(0)));
+  (void)(my_seek(filedes, offset, MY_SEEK_SET, MYF(0)));
   /* read appropriate portion of the file */
   if ((bytes_read= my_read(filedes, buff, buff_size,
                            MYF(0))) == MY_FILE_ERROR)
===== storage/example/ha_example.cc 1.61 vs edited =====
--- 1.61/storage/example/ha_example.cc	2007-08-27 20:20:00 +02:00
+++ edited/storage/example/ha_example.cc	2007-11-03 02:21:55 +01:00
@@ -131,7 +131,7 @@
   DBUG_ENTER("example_init_func");
 
   example_hton= (handlerton *)p;
-  VOID(pthread_mutex_init(&example_mutex,MY_MUTEX_INIT_FAST));
+  (void)(pthread_mutex_init(&example_mutex,MY_MUTEX_INIT_FAST));
   (void) hash_init(&example_open_tables,system_charset_info,32,0,0,
                    (hash_get_key) example_get_key,0,0);
 
===== storage/federated/ha_federated.cc 1.111 vs edited =====
--- 1.111/storage/federated/ha_federated.cc	2007-09-21 10:15:01 +02:00
+++ edited/storage/federated/ha_federated.cc	2007-11-03 02:21:55 +01:00
@@ -464,7 +464,7 @@
     DBUG_RETURN(FALSE);
   }
 
-  VOID(pthread_mutex_destroy(&federated_mutex));
+  (void)(pthread_mutex_destroy(&federated_mutex));
 error:
   DBUG_RETURN(TRUE);
 }
@@ -483,7 +483,7 @@
 int federated_done(void *p)
 {
   hash_free(&federated_open_tables);
-  VOID(pthread_mutex_destroy(&federated_mutex));
+  (void)(pthread_mutex_destroy(&federated_mutex));
 
   return 0;
 }
@@ -1534,7 +1534,7 @@
   {
     hash_delete(&federated_open_tables, (uchar*) share);
     thr_lock_delete(&share->lock);
-    VOID(pthread_mutex_destroy(&share->mutex));
+    (void)(pthread_mutex_destroy(&share->mutex));
     free_root(&mem_root, MYF(0));
   }
   pthread_mutex_unlock(&federated_mutex);
===== storage/heap/hp_clear.c 1.13 vs edited =====
--- 1.13/storage/heap/hp_clear.c	2007-05-10 11:59:31 +02:00
+++ edited/storage/heap/hp_clear.c	2007-11-03 17:02:39 +01:00
@@ -31,7 +31,7 @@
   DBUG_ENTER("hp_clear");
 
   if (info->block.levels)
-    VOID(hp_free_level(&info->block,info->block.levels,info->block.root,
+    (void)(hp_free_level(&info->block,info->block.levels,info->block.root,
 			(uchar*) 0));
   info->block.levels=0;
   hp_clear_keys(info);
@@ -94,7 +94,7 @@
     {
       HP_BLOCK *block= &keyinfo->block;
       if (block->levels)
-        VOID(hp_free_level(block,block->levels,block->root,(uchar*) 0));
+        (void)hp_free_level(block,block->levels,block->root,(uchar*) 0);
       block->levels=0;
       block->last_allocated=0;
       keyinfo->hash_buckets= 0;
===== storage/heap/hp_create.c 1.29 vs edited =====
--- 1.29/storage/heap/hp_create.c	2007-07-25 00:58:06 +02:00
+++ edited/storage/heap/hp_create.c	2007-11-03 17:02:39 +01:00
@@ -194,7 +194,7 @@
     }
 #ifdef THREAD
     thr_lock_init(&share->lock);
-    VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST));
+    (void)pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST);
 #endif
     if (!create_info->internal_table)
     {
@@ -298,7 +298,7 @@
   hp_clear(share);			/* Remove blocks from memory */
 #ifdef THREAD
   thr_lock_delete(&share->lock);
-  VOID(pthread_mutex_destroy(&share->intern_lock));
+  (void)pthread_mutex_destroy(&share->intern_lock);
 #endif
   my_free((uchar*) share->name, MYF(0));
   my_free((uchar*) share, MYF(0));
===== storage/innobase/handler/ha_innodb.cc 1.292 vs edited =====
--- 1.292/storage/innobase/handler/ha_innodb.cc	2007-10-10 22:18:31 +02:00
+++ edited/storage/innobase/handler/ha_innodb.cc	2007-11-03 02:21:55 +01:00
@@ -703,7 +703,7 @@
 innobase_mysql_prepare_print_arbitrary_thd(void)
 /*============================================*/
 {
-	VOID(pthread_mutex_lock(&LOCK_thread_count));
+	(void)(pthread_mutex_lock(&LOCK_thread_count));
 }
 
 /*****************************************************************
@@ -715,7 +715,7 @@
 innobase_mysql_end_print_arbitrary_thd(void)
 /*========================================*/
 {
-	VOID(pthread_mutex_unlock(&LOCK_thread_count));
+	(void)(pthread_mutex_unlock(&LOCK_thread_count));
 }
 
 /*****************************************************************
===== storage/myisam/ha_myisam.cc 1.228 vs edited =====
--- 1.228/storage/myisam/ha_myisam.cc	2007-10-19 22:15:59 +02:00
+++ edited/storage/myisam/ha_myisam.cc	2007-11-03 02:21:50 +01:00
@@ -617,11 +617,11 @@
   }
   
   if (test_if_locked & (HA_OPEN_IGNORE_IF_LOCKED | HA_OPEN_TMP_TABLE))
-    VOID(mi_extra(file, HA_EXTRA_NO_WAIT_LOCK, 0));
+    (void)(mi_extra(file, HA_EXTRA_NO_WAIT_LOCK, 0));
 
   info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
   if (!(test_if_locked & HA_OPEN_WAIT_IF_LOCKED))
-    VOID(mi_extra(file, HA_EXTRA_WAIT_LOCK, 0));
+    (void)(mi_extra(file, HA_EXTRA_WAIT_LOCK, 0));
   if (!table->s->db_record_offset)
     int_table_flags|=HA_REC_NOT_IN_SEQ;
   if (file->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD))
===== storage/myisam/mi_changed.c 1.8 vs edited =====
--- 1.8/storage/myisam/mi_changed.c	2006-12-31 01:06:39 +01:00
+++ edited/storage/myisam/mi_changed.c	2007-11-03 17:02:48 +01:00
@@ -25,7 +25,7 @@
   DBUG_ENTER("mi_is_changed");
   if (fast_mi_readinfo(info))
     DBUG_RETURN(-1);
-  VOID(_mi_writeinfo(info,0));
+  (void)_mi_writeinfo(info,0);
   result=(int) info->data_changed;
   info->data_changed=0;
   DBUG_PRINT("exit",("result: %d",result));
===== storage/myisam/mi_check.c 1.163 vs edited =====
--- 1.163/storage/myisam/mi_check.c	2007-08-13 15:11:15 +02:00
+++ edited/storage/myisam/mi_check.c	2007-11-03 17:02:48 +01:00
@@ -1183,7 +1183,7 @@
 	goto err;
       start_recpos=pos;
       splits++;
-      VOID(_mi_pack_get_block_info(info, &info->bit_buff, &block_info,
+      (void)(_mi_pack_get_block_info(info, &info->bit_buff, &block_info,
                                    &info->rec_buff, -1, start_recpos));
       pos=block_info.filepos+block_info.rec_len;
       if (block_info.rec_len < (uint) info->s->min_pack_length ||
@@ -1218,7 +1218,7 @@
       records++;
       if (param->testflag & T_WRITE_LOOP && records % WRITE_COUNT == 0)
       {
-	printf("%s\r", llstr(records,llbuff)); VOID(fflush(stdout));
+	printf("%s\r", llstr(records,llbuff)); (void)fflush(stdout);
       }
 
       /* Check if keys match the record */
@@ -1271,7 +1271,7 @@
   }
   if (param->testflag & T_WRITE_LOOP)
   {
-    VOID(fputs("          \r",stdout)); VOID(fflush(stdout));
+    (void)fputs("          \r",stdout); (void)fflush(stdout);
   }
   if (records != info->state->records)
   {
@@ -1413,7 +1413,7 @@
     param->testflag|=T_CALC_CHECKSUM;
 
   if (!param->using_global_keycache)
-    VOID(init_key_cache(dflt_key_cache, param->key_cache_block_size,
+    (void)(init_key_cache(dflt_key_cache, param->key_cache_block_size,
                         param->use_buffers, 0, 0));
 
   if (init_io_cache(&param->read_cache,info->dfile,
@@ -1523,7 +1523,7 @@
 			  llstr(info->dupp_key_pos,llbuff2));
       if (param->testflag & T_VERBOSE)
       {
-	VOID(_mi_make_key(info,(uint) info->errkey,info->lastkey,
+	(void)(_mi_make_key(info,(uint) info->errkey,info->lastkey,
 			  sort_param.record,0L));
 	_mi_print_key(stdout,share->keyinfo[info->errkey].seg,info->lastkey,
 		      USE_WHOLE_KEY);
@@ -1546,7 +1546,7 @@
 
   if (param->testflag & T_WRITE_LOOP)
   {
-    VOID(fputs("          \r",stdout)); VOID(fflush(stdout));
+    (void)fputs("          \r",stdout); (void)fflush(stdout);
   }
   if (my_chsize(share->kfile,info->state->key_file_length,0,MYF(0)))
   {
@@ -1628,8 +1628,8 @@
 		  llstr(sort_param.start_recpos,llbuff));
     if (new_file >= 0)
     {
-      VOID(my_close(new_file,MYF(0)));
-      VOID(my_raid_delete(param->temp_filename,info->s->base.raid_chunks,
+      (void)my_close(new_file,MYF(0));
+      (void)(my_raid_delete(param->temp_filename,info->s->base.raid_chunks,
 			  MYF(MY_WME)));
       info->rec_cache.file=-1; /* don't flush data to new_file, it's closed */
     }
@@ -1639,9 +1639,9 @@
                             MYF(MY_ALLOW_ZERO_PTR));
   my_free(sort_param.record,MYF(MY_ALLOW_ZERO_PTR));
   my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR));
-  VOID(end_io_cache(&param->read_cache));
+  (void)end_io_cache(&param->read_cache);
   info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
-  VOID(end_io_cache(&info->rec_cache));
+  (void)end_io_cache(&info->rec_cache);
   got_error|=flush_blocks(param, share->key_cache, share->kfile);
   if (!got_error && param->testflag & T_UNPACK)
   {
@@ -1868,9 +1868,9 @@
 	/* Put same locks as old file */
   share->r_locks= share->w_locks= share->tot_locks= 0;
   (void) _mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
-  VOID(my_close(share->kfile,MYF(MY_WME)));
+  (void)my_close(share->kfile,MYF(MY_WME));
   share->kfile = -1;
-  VOID(my_close(new_file,MYF(MY_WME)));
+  (void)my_close(new_file,MYF(MY_WME));
   if (change_to_newfile(share->index_file_name,MI_NAME_IEXT,INDEX_TMP_EXT,0,
 			MYF(0)) ||
       mi_open_keyfile(share))
@@ -1894,9 +1894,9 @@
   DBUG_RETURN(0);
 
 err:
-  VOID(my_close(new_file,MYF(MY_WME)));
+  (void)my_close(new_file,MYF(MY_WME));
 err2:
-  VOID(my_delete(param->temp_filename,MYF(MY_WME)));
+  (void)my_delete(param->temp_filename,MYF(MY_WME));
   DBUG_RETURN(-1);
 } /* mi_sort_index */
 
@@ -2053,7 +2053,7 @@
     buff=tmp_buff; buff_length=IO_SIZE;
   }
 
-  VOID(my_seek(from,start,MY_SEEK_SET,MYF(0)));
+  (void)my_seek(from,start,MY_SEEK_SET,MYF(0));
   while (length > buff_length)
   {
     if (my_read(from,(uchar*) buff,buff_length,MYF(MY_NABP)) ||
@@ -2366,7 +2366,7 @@
 
   if (param->testflag & T_WRITE_LOOP)
   {
-    VOID(fputs("          \r",stdout)); VOID(fflush(stdout));
+    (void)fputs("          \r",stdout); (void)fflush(stdout);
   }
 
   if (rep_quick && del+sort_info.dupp != info->state->del)
@@ -2419,7 +2419,7 @@
 
 err:
   got_error|= flush_blocks(param, share->key_cache, share->kfile);
-  VOID(end_io_cache(&info->rec_cache));
+  (void)end_io_cache(&info->rec_cache);
   if (!got_error)
   {
     /* Replace the actual file with the temporary file */
@@ -2441,8 +2441,8 @@
       mi_check_print_error(param,"%d when fixing table",my_errno);
     if (new_file >= 0)
     {
-      VOID(my_close(new_file,MYF(0)));
-      VOID(my_raid_delete(param->temp_filename,share->base.raid_chunks,
+      (void)my_close(new_file,MYF(0));
+      (void)(my_raid_delete(param->temp_filename,share->base.raid_chunks,
 			  MYF(MY_WME)));
       if (info->dfile == new_file)
 	info->dfile= -1;
@@ -2459,7 +2459,7 @@
   my_free((uchar*) sort_info.key_block,MYF(MY_ALLOW_ZERO_PTR));
   my_free((uchar*) sort_info.ft_buf, MYF(MY_ALLOW_ZERO_PTR));
   my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR));
-  VOID(end_io_cache(&param->read_cache));
+  (void)end_io_cache(&param->read_cache);
   info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
   if (!got_error && (param->testflag & T_UNPACK))
   {
@@ -2944,7 +2944,7 @@
     the share by remove_io_thread() or it was not yet started (if the
     error happend before creating the thread).
   */
-  VOID(end_io_cache(&info->rec_cache));
+  (void)end_io_cache(&info->rec_cache);
   /*
     Destroy the new data cache in case of non-quick repair. All slave
     threads did either detach from the share by remove_io_thread()
@@ -2952,7 +2952,7 @@
     creating the threads).
   */
   if (!rep_quick)
-    VOID(end_io_cache(&new_data_cache));
+    (void)end_io_cache(&new_data_cache);
   if (!got_error)
   {
     /* Replace the actual file with the temporary file */
@@ -2974,8 +2974,8 @@
       mi_check_print_error(param,"%d when fixing table",my_errno);
     if (new_file >= 0)
     {
-      VOID(my_close(new_file,MYF(0)));
-      VOID(my_raid_delete(param->temp_filename,share->base.raid_chunks,
+      (void)my_close(new_file,MYF(0));
+      (void)(my_raid_delete(param->temp_filename,share->base.raid_chunks,
 			  MYF(MY_WME)));
       if (info->dfile == new_file)
 	info->dfile= -1;
@@ -2993,7 +2993,7 @@
   my_free((uchar*) sort_info.key_block,MYF(MY_ALLOW_ZERO_PTR));
   my_free((uchar*) sort_param,MYF(MY_ALLOW_ZERO_PTR));
   my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR));
-  VOID(end_io_cache(&param->read_cache));
+  (void)end_io_cache(&param->read_cache);
   info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
   if (!got_error && (param->testflag & T_UNPACK))
   {
@@ -3643,7 +3643,7 @@
     {
       char llbuff[22];
       printf("%s\r", llstr(info->state->records,llbuff));
-      VOID(fflush(stdout));
+      (void)fflush(stdout);
     }
   }
   DBUG_RETURN(0);
@@ -3917,7 +3917,7 @@
   key_block->end_pos+=t_length;
   if (a_length <= keyinfo->block_length)
   {
-    VOID(_mi_move_key(keyinfo,key_block->lastkey,key));
+    (void)_mi_move_key(keyinfo,key_block->lastkey,key);
     key_block->last_length=a_length-t_length;
     DBUG_RETURN(0);
   }
@@ -4196,7 +4196,7 @@
   set_if_bigger(file_length,tmp_length);
   set_if_bigger(file_length,(ulonglong) share.base.max_data_file_length);
 
-  VOID(mi_close(*org_info));
+  (void)mi_close(*org_info);
   bzero((char*) &create_info,sizeof(create_info));
   create_info.max_rows=max(max_records,share.base.records);
   create_info.reloc_rows=share.base.reloc;
@@ -4237,7 +4237,7 @@
   }
   /* We are modifing */
   (*org_info)->s->options&= ~HA_OPTION_READ_ONLY_DATA;
-  VOID(_mi_readinfo(*org_info,F_WRLCK,0));
+  (void)_mi_readinfo(*org_info,F_WRLCK,0);
   (*org_info)->state->records=info.state->records;
   if (share.state.create_time)
     (*org_info)->s->state.create_time=share.state.create_time;
===== storage/myisam/mi_close.c 1.26 vs edited =====
--- 1.26/storage/myisam/mi_close.c	2007-05-10 11:59:32 +02:00
+++ edited/storage/myisam/mi_close.c	2007-11-03 17:02:49 +01:00
@@ -92,13 +92,13 @@
     }
 #ifdef THREAD
     thr_lock_delete(&share->lock);
-    VOID(pthread_mutex_destroy(&share->intern_lock));
+    (void)pthread_mutex_destroy(&share->intern_lock);
     {
       int i,keys;
       keys = share->state.header.keys;
-      VOID(rwlock_destroy(&share->mmap_lock));
+      (void)rwlock_destroy(&share->mmap_lock);
       for(i=0; i<keys; i++) {
-	VOID(rwlock_destroy(&share->key_root_lock[i]));
+	(void)rwlock_destroy(&share->key_root_lock[i]);
       }
     }
 #endif
===== storage/myisam/mi_create.c 1.73 vs edited =====
--- 1.73/storage/myisam/mi_create.c	2007-10-09 19:55:16 +02:00
+++ edited/storage/myisam/mi_create.c	2007-11-03 17:02:49 +01:00
@@ -837,7 +837,7 @@
   save_errno=my_errno;
   switch (errpos) {
   case 3:
-    VOID(my_close(dfile,MYF(0)));
+    (void)my_close(dfile,MYF(0));
     /* fall through */
   case 2:
     /* QQ: Tõnu should add a call to my_raid_delete() here */
@@ -847,7 +847,7 @@
 			   MYF(0));
     /* fall through */
   case 1:
-    VOID(my_close(file,MYF(0)));
+    (void)my_close(file,MYF(0));
     if (! (flags & HA_DONT_TOUCH_DATA))
       my_delete_with_symlink(fn_format(filename,name,"",MI_NAME_IEXT,
                                        MY_UNPACK_FILENAME | MY_APPEND_EXT),
===== storage/myisam/mi_dbug.c 1.17 vs edited =====
--- 1.17/storage/myisam/mi_dbug.c	2006-12-31 01:06:39 +01:00
+++ edited/storage/myisam/mi_dbug.c	2007-11-03 17:02:49 +01:00
@@ -30,12 +30,12 @@
   const uchar *end;
   const uchar *key_end=key+length;
 
-  VOID(fputs("Key: \"",stream));
+  (void)fputs("Key: \"",stream);
   flag=0;
   for (; keyseg->type && key < key_end ;keyseg++)
   {
     if (flag++)
-      VOID(putc('-',stream));
+      (void)putc('-',stream);
     end= key+ keyseg->length;
     if (keyseg->flag & HA_NULL_PART)
     {
@@ -51,7 +51,7 @@
     case HA_KEYTYPE_BINARY:
       if (!(keyseg->flag & HA_SPACE_PACK) && keyseg->length == 1)
       {						/* packed binary digit */
-	VOID(fprintf(stream,"%d",(uint) *key++));
+	(void)fprintf(stream,"%d",(uint) *key++);
 	break;
       }
       /* fall through */
@@ -59,58 +59,58 @@
     case HA_KEYTYPE_NUM:
       if (keyseg->flag & HA_SPACE_PACK)
       {
-	VOID(fprintf(stream,"%.*s",(int) *key,key+1));
+	(void)fprintf(stream,"%.*s",(int) *key,key+1);
 	key+= (int) *key+1;
       }
       else
       {
-	VOID(fprintf(stream,"%.*s",(int) keyseg->length,key));
+	(void)fprintf(stream,"%.*s",(int) keyseg->length,key);
 	key=end;
       }
       break;
     case HA_KEYTYPE_INT8:
-      VOID(fprintf(stream,"%d",(int) *((signed char*) key)));
+      (void)fprintf(stream,"%d",(int) *((signed char*) key));
       key=end;
       break;
     case HA_KEYTYPE_SHORT_INT:
       s_1= mi_sint2korr(key);
-      VOID(fprintf(stream,"%d",(int) s_1));
+      (void)fprintf(stream,"%d",(int) s_1);
       key=end;
       break;
     case HA_KEYTYPE_USHORT_INT:
       {
 	ushort u_1;
 	u_1= mi_uint2korr(key);
-	VOID(fprintf(stream,"%u",(uint) u_1));
+	(void)fprintf(stream,"%u",(uint) u_1);
 	key=end;
 	break;
       }
     case HA_KEYTYPE_LONG_INT:
       l_1=mi_sint4korr(key);
-      VOID(fprintf(stream,"%ld",l_1));
+      (void)fprintf(stream,"%ld",l_1);
       key=end;
       break;
     case HA_KEYTYPE_ULONG_INT:
       l_1=mi_sint4korr(key);
-      VOID(fprintf(stream,"%lu",(ulong) l_1));
+      (void)fprintf(stream,"%lu",(ulong) l_1);
       key=end;
       break;
     case HA_KEYTYPE_INT24:
-      VOID(fprintf(stream,"%ld",(long) mi_sint3korr(key)));
+      (void)fprintf(stream,"%ld",(long) mi_sint3korr(key));
       key=end;
       break;
     case HA_KEYTYPE_UINT24:
-      VOID(fprintf(stream,"%lu",(ulong) mi_uint3korr(key)));
+      (void)fprintf(stream,"%lu",(ulong) mi_uint3korr(key));
       key=end;
       break;
     case HA_KEYTYPE_FLOAT:
       mi_float4get(f_1,key);
-      VOID(fprintf(stream,"%g",(double) f_1));
+      (void)fprintf(stream,"%g",(double) f_1);
       key=end;
       break;
     case HA_KEYTYPE_DOUBLE:
       mi_float8get(d_1,key);
-      VOID(fprintf(stream,"%g",d_1));
+      (void)fprintf(stream,"%g",d_1);
       key=end;
       break;
 #ifdef HAVE_LONG_LONG
@@ -118,7 +118,7 @@
     {
       char buff[21];
       longlong2str(mi_sint8korr(key),buff,-10);
-      VOID(fprintf(stream,"%s",buff));
+      (void)fprintf(stream,"%s",buff);
       key=end;
       break;
     }
@@ -126,7 +126,7 @@
     {
       char buff[21];
       longlong2str(mi_sint8korr(key),buff,10);
-      VOID(fprintf(stream,"%s",buff));
+      (void)fprintf(stream,"%s",buff);
       key=end;
       break;
     }
@@ -152,14 +152,14 @@
 	The following command sometimes gives a warning from valgrind.
 	Not yet sure if the bug is in valgrind, glibc or mysqld
       */
-      VOID(fprintf(stream,"%.*s",(int) tmp_length,key));
+      (void)fprintf(stream,"%.*s",(int) tmp_length,key);
       key+=tmp_length;
       break;
     }
     default: break;			/* This never happens */
     }
   }
-  VOID(fputs("\"\n",stream));
+  (void)fputs("\"\n",stream);
   return;
 } /* print_key */
 
===== storage/myisam/mi_delete.c 1.47 vs edited =====
--- 1.47/storage/myisam/mi_delete.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_delete.c	2007-11-03 17:02:49 +01:00
@@ -101,7 +101,7 @@
 
   mi_sizestore(lastpos,info->lastpos);
   myisam_log_command(MI_LOG_DELETE,info,(uchar*) lastpos,sizeof(lastpos),0);
-  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
   allow_break();			/* Allow SIGHUP & SIGINT */
   if (info->invalidator != 0)
   {
@@ -120,7 +120,7 @@
     mi_print_error(info->s, HA_ERR_CRASHED);
     mi_mark_crashed(info);		/* mark table crashed */
   }
-  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
   info->update|=HA_STATE_WRITTEN;	/* Buffer changed */
   allow_break();			/* Allow SIGHUP & SIGINT */
   my_errno=save_errno;
===== storage/myisam/mi_delete_all.c 1.22 vs edited =====
--- 1.22/storage/myisam/mi_delete_all.c	2007-05-10 11:59:32 +02:00
+++ edited/storage/myisam/mi_delete_all.c	2007-11-03 17:02:50 +01:00
@@ -56,7 +56,7 @@
   if (my_chsize(info->dfile, 0, 0, MYF(MY_WME)) ||
       my_chsize(share->kfile, share->base.keystart, 0, MYF(MY_WME))  )
     goto err;
-  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
 #ifdef HAVE_MMAP
   /* Resize mmaped area */
   rw_wrlock(&info->s->mmap_lock);
@@ -69,7 +69,7 @@
 err:
   {
     int save_errno=my_errno;
-    VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+    (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
     info->update|=HA_STATE_WRITTEN;	/* Buffer changed */
     allow_break();			/* Allow SIGHUP & SIGINT */
     DBUG_RETURN(my_errno=save_errno);
===== storage/myisam/mi_dynrec.c 1.61 vs edited =====
--- 1.61/storage/myisam/mi_dynrec.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_dynrec.c	2007-11-03 17:02:50 +01:00
@@ -112,7 +112,7 @@
 {
   if (info->s->file_map)
   {
-    VOID(my_munmap((char*) info->s->file_map,
+    (void)(my_munmap((char*) info->s->file_map,
                    (size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN));
     mi_dynmap_file(info, size);
   }
@@ -1444,7 +1444,7 @@
 panic:
   my_errno=HA_ERR_WRONG_IN_RECORD;
 err:
-  VOID(_mi_writeinfo(info,0));
+  (void)_mi_writeinfo(info,0);
   DBUG_RETURN(-1);
 }
 
@@ -1761,7 +1761,7 @@
             block_info.filepos + block_info.data_len &&
             flush_io_cache(&info->rec_cache))
           goto err;
-	/* VOID(my_seek(info->dfile,filepos,MY_SEEK_SET,MYF(0))); */
+	/* (void)my_seek(info->dfile,filepos,MY_SEEK_SET,MYF(0)); */
 	if (my_read(info->dfile,(uchar*) to,block_info.data_len,MYF(MY_NABP)))
 	{
 	  if (my_errno == -1)
@@ -1795,7 +1795,7 @@
   my_errno=HA_ERR_WRONG_IN_RECORD;		/* Something is fatal wrong */
 err:
   save_errno=my_errno;
-  VOID(_mi_writeinfo(info,0));
+  (void)_mi_writeinfo(info,0);
   DBUG_RETURN(my_errno=save_errno);
 }
 
@@ -1814,7 +1814,7 @@
       pointer set to the end of the header after this function.
       my_pread() may leave the file pointer untouched.
     */
-    VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
+    (void)my_seek(file,filepos,MY_SEEK_SET,MYF(0));
     if (my_read(file, header, sizeof(info->header),MYF(0)) !=
 	sizeof(info->header))
       goto err;
===== storage/myisam/mi_info.c 1.20 vs edited =====
--- 1.20/storage/myisam/mi_info.c	2007-04-13 09:43:59 +02:00
+++ edited/storage/myisam/mi_info.c	2007-11-03 17:02:51 +01:00
@@ -43,7 +43,7 @@
   if (!(flag & HA_STATUS_NO_LOCK))
   {
     pthread_mutex_lock(&share->intern_lock);
-    VOID(_mi_readinfo(info,F_RDLCK,0));
+    (void)_mi_readinfo(info,F_RDLCK,0);
     fast_mi_writeinfo(info);
     pthread_mutex_unlock(&share->intern_lock);
   }
===== storage/myisam/mi_locking.c 1.55 vs edited =====
--- 1.55/storage/myisam/mi_locking.c	2007-10-12 18:03:01 +02:00
+++ edited/storage/myisam/mi_locking.c	2007-11-03 17:02:52 +01:00
@@ -175,12 +175,12 @@
 	if (mi_state_info_read_dsk(share->kfile, &share->state, 1))
 	{
 	  error=my_errno;
-	  VOID(my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE)));
+	  (void)my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
 	  my_errno=error;
 	  break;
 	}
       }
-      VOID(_mi_test_if_changed(info));
+      (void)_mi_test_if_changed(info);
       share->r_locks++;
       share->tot_locks++;
       info->lock_type=lock_type;
@@ -220,7 +220,7 @@
 	    if (mi_state_info_read_dsk(share->kfile, &share->state, 1))
 	    {
 	      error=my_errno;
-	      VOID(my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,
+	      (void)(my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,
 			   info->lock_wait | MY_SEEK_NOT_DONE));
 	      my_errno=error;
 	      break;
@@ -228,7 +228,7 @@
 	  }
 	}
       }
-      VOID(_mi_test_if_changed(info));
+      (void)_mi_test_if_changed(info);
         
       info->lock_type=lock_type;
       info->invalidator=info->s->invalidator;
@@ -414,14 +414,14 @@
       if (mi_state_info_read_dsk(share->kfile, &share->state, 1))
       {
 	int error=my_errno ? my_errno : -1;
-	VOID(my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,
+	(void)(my_lock(share->kfile,F_UNLCK,0L,F_TO_EOF,
 		     MYF(MY_SEEK_NOT_DONE)));
 	my_errno=error;
 	DBUG_RETURN(1);
       }
     }
     if (check_keybuffer)
-      VOID(_mi_test_if_changed(info));
+      (void)_mi_test_if_changed(info);
     info->invalidator=info->s->invalidator;
   }
   else if (lock_type == F_WRLCK && info->lock_type == F_RDLCK)
@@ -489,7 +489,7 @@
   {						/* Keyfile has changed */
     DBUG_PRINT("info",("index file changed"));
     if (share->state.process != share->this_process)
-      VOID(flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE));
+      (void)flush_key_blocks(share->key_cache, share->kfile, FLUSH_RELEASE);
     share->last_process=share->state.process;
     info->last_unique=	share->state.unique;
     info->last_loop=	share->state.update_count;
===== storage/myisam/mi_log.c 1.17 vs edited =====
--- 1.17/storage/myisam/mi_log.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_log.c	2007-11-03 17:02:52 +01:00
@@ -88,8 +88,8 @@
 
   pthread_mutex_lock(&THR_LOCK_myisam);
   error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
-  VOID(my_write(myisam_log_file,buff,sizeof(buff),MYF(0)));
-  VOID(my_write(myisam_log_file,buffert,length,MYF(0)));
+  (void)my_write(myisam_log_file,buff,sizeof(buff),MYF(0));
+  (void)my_write(myisam_log_file,buffert,length,MYF(0));
   if (!error)
     error=my_lock(myisam_log_file,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
   pthread_mutex_unlock(&THR_LOCK_myisam);
@@ -111,9 +111,9 @@
   mi_int2store(buff+7,result);
   pthread_mutex_lock(&THR_LOCK_myisam);
   error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
-  VOID(my_write(myisam_log_file,buff,sizeof(buff),MYF(0)));
+  (void)my_write(myisam_log_file,buff,sizeof(buff),MYF(0));
   if (buffert)
-    VOID(my_write(myisam_log_file,buffert,length,MYF(0)));
+    (void)my_write(myisam_log_file,buffert,length,MYF(0));
   if (!error)
     error=my_lock(myisam_log_file,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
   pthread_mutex_unlock(&THR_LOCK_myisam);
@@ -142,8 +142,8 @@
   mi_int4store(buff+17,length);
   pthread_mutex_lock(&THR_LOCK_myisam);
   error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
-  VOID(my_write(myisam_log_file, buff,sizeof(buff),MYF(0)));
-  VOID(my_write(myisam_log_file, record,info->s->base.reclength,MYF(0)));
+  (void)my_write(myisam_log_file, buff,sizeof(buff),MYF(0));
+  (void)my_write(myisam_log_file, record,info->s->base.reclength,MYF(0));
   if (info->s->base.blobs)
   {
     MI_BLOB *blob,*end;
@@ -154,7 +154,7 @@
     {
       memcpy_fixed((uchar*) &pos, record+blob->offset+blob->pack_length,
                    sizeof(char*));
-      VOID(my_write(myisam_log_file,pos,blob->length,MYF(0)));
+      (void)my_write(myisam_log_file,pos,blob->length,MYF(0));
     }
   }
   if (!error)
===== storage/myisam/mi_open.c 1.127 vs edited =====
--- 1.127/storage/myisam/mi_open.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_open.c	2007-11-03 17:02:52 +01:00
@@ -174,7 +174,7 @@
     end_pos=disk_cache+info_length;
     errpos=2;
 
-    VOID(my_seek(kfile,0L,MY_SEEK_SET,MYF(0)));
+    (void)my_seek(kfile,0L,MY_SEEK_SET,MYF(0));
     if (!(open_flags & HA_OPEN_TMP_TABLE))
     {
       if ((lock_error=my_lock(kfile,F_RDLCK,0L,F_TO_EOF,
@@ -469,7 +469,7 @@
 
     if (! lock_error)
     {
-      VOID(my_lock(kfile,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE)));
+      (void)my_lock(kfile,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
       lock_error=1;			/* Database unlocked */
     }
 
@@ -509,10 +509,10 @@
     share->is_log_table= FALSE;
 #ifdef THREAD
     thr_lock_init(&share->lock);
-    VOID(pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST));
+    (void)pthread_mutex_init(&share->intern_lock,MY_MUTEX_INIT_FAST);
     for (i=0; i<keys; i++)
-      VOID(my_rwlock_init(&share->key_root_lock[i], NULL));
-    VOID(my_rwlock_init(&share->mmap_lock, NULL));
+      (void)my_rwlock_init(&share->key_root_lock[i], NULL);
+    (void)my_rwlock_init(&share->mmap_lock, NULL);
     if (!thr_lock_inited)
     {
       /* Probably a single threaded program; Don't use concurrent inserts */
@@ -657,7 +657,7 @@
     my_free((uchar*) m_info,MYF(0));
     /* fall through */
   case 5:
-    VOID(my_close(info.dfile,MYF(0)));
+    (void)my_close(info.dfile,MYF(0));
     if (old_info)
       break;					/* Don't remove open table */
     /* fall through */
@@ -666,13 +666,13 @@
     /* fall through */
   case 3:
     if (! lock_error)
-      VOID(my_lock(kfile, F_UNLCK, 0L, F_TO_EOF, MYF(MY_SEEK_NOT_DONE)));
+      (void)my_lock(kfile, F_UNLCK, 0L, F_TO_EOF, MYF(MY_SEEK_NOT_DONE));
     /* fall through */
   case 2:
     my_afree(disk_cache);
     /* fall through */
   case 1:
-    VOID(my_close(kfile,MYF(0)));
+    (void)my_close(kfile,MYF(0));
     /* fall through */
   case 0:
   default:
===== storage/myisam/mi_packrec.c 1.49 vs edited =====
--- 1.49/storage/myisam/mi_packrec.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_packrec.c	2007-11-03 17:02:52 +01:00
@@ -1367,7 +1367,7 @@
       We can't use my_pread() here because mi_read_rnd_pack_record assumes
       position is ok
     */
-    VOID(my_seek(file,filepos,MY_SEEK_SET,MYF(0)));
+    (void)my_seek(file,filepos,MY_SEEK_SET,MYF(0));
     if (my_read(file, header,ref_length,MYF(MY_NABP)))
       return BLOCK_FATAL_ERROR;
     DBUG_DUMP("header",(uchar*) header,ref_length);
@@ -1507,7 +1507,7 @@
 
 void _mi_unmap_file(MI_INFO *info)
 {
-  VOID(my_munmap((char*) info->s->file_map, 
+  (void)(my_munmap((char*) info->s->file_map, 
                  (size_t) info->s->mmaped_length + MEMMAP_EXTRA_MARGIN));
 }
 
===== storage/myisam/mi_panic.c 1.13 vs edited =====
--- 1.13/storage/myisam/mi_panic.c	2006-12-31 01:06:40 +01:00
+++ edited/storage/myisam/mi_panic.c	2007-11-03 17:02:53 +01:00
@@ -103,7 +103,7 @@
   }
   if (flag == HA_PANIC_CLOSE)
   {
-    VOID(mi_log(0));				/* Close log if neaded */
+    (void)mi_log(0);				/* Close log if neaded */
     ft_free_stopwords();
   }
   pthread_mutex_unlock(&THR_LOCK_myisam);
===== storage/myisam/mi_rsame.c 1.11 vs edited =====
--- 1.11/storage/myisam/mi_rsame.c	2007-05-10 11:59:32 +02:00
+++ edited/storage/myisam/mi_rsame.c	2007-11-03 02:21:51 +01:00
@@ -50,7 +50,7 @@
 				      info->lastpos);
     if (info->s->concurrent_insert)
       rw_rdlock(&info->s->key_root_lock[inx]);
-    VOID(_mi_search(info,info->s->keyinfo+inx,info->lastkey, USE_WHOLE_KEY,
+    (void)(_mi_search(info,info->s->keyinfo+inx,info->lastkey, USE_WHOLE_KEY,
 		    SEARCH_SAME,
 		    info->s->state.key_root[inx]));
     if (info->s->concurrent_insert)
===== storage/myisam/mi_statrec.c 1.19 vs edited =====
--- 1.19/storage/myisam/mi_statrec.c	2007-08-13 15:11:16 +02:00
+++ edited/storage/myisam/mi_statrec.c	2007-11-03 17:02:57 +01:00
@@ -282,7 +282,7 @@
 		    info->s->base.pack_reclength - info->s->base.reclength);
   }
   if (locked)
-    VOID(_mi_writeinfo(info,0));		/* Unlock keyfile */
+    (void)_mi_writeinfo(info,0);		/* Unlock keyfile */
   if (!error)
   {
     if (!buf[0])
===== storage/myisam/mi_update.c 1.29 vs edited =====
--- 1.29/storage/myisam/mi_update.c	2007-08-13 15:11:17 +02:00
+++ edited/storage/myisam/mi_update.c	2007-11-03 17:02:58 +01:00
@@ -181,7 +181,7 @@
     mi_update() must always pass !0 value as operation, since even if
     there is no index change there could be data change.
   */
-  VOID(_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE);
   allow_break();				/* Allow SIGHUP & SIGINT */
   if (info->invalidator != 0)
   {
@@ -232,7 +232,7 @@
 
  err_end:
   myisam_log_record(MI_LOG_UPDATE,info,newrec,info->lastpos,my_errno);
-  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
   allow_break();				/* Allow SIGHUP & SIGINT */
   if (save_errno == HA_ERR_KEY_NOT_FOUND)
   {
===== storage/myisam/mi_write.c 1.70 vs edited =====
--- 1.70/storage/myisam/mi_write.c	2007-09-21 10:15:04 +02:00
+++ edited/storage/myisam/mi_write.c	2007-11-03 17:02:58 +01:00
@@ -155,7 +155,7 @@
   info->state->records++;
   info->lastpos=filepos;
   myisam_log_record(MI_LOG_WRITE,info,record,filepos,0);
-  VOID(_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE);
   if (info->invalidator != 0)
   {
     DBUG_PRINT("info", ("invalidator... '%s' (update)", info->filename));
@@ -232,7 +232,7 @@
 err2:
   save_errno=my_errno;
   myisam_log_record(MI_LOG_WRITE,info,record,filepos,my_errno);
-  VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
+  (void)_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
   allow_break();			/* Allow SIGHUP & SIGINT */
   DBUG_RETURN(my_errno=save_errno);
 } /* mi_write */
===== storage/myisam/myisamchk.c 1.131 vs edited =====
--- 1.131/storage/myisam/myisamchk.c	2007-10-19 22:15:59 +02:00
+++ edited/storage/myisam/myisamchk.c	2007-11-03 17:02:59 +01:00
@@ -99,8 +99,8 @@
     int new_error=myisamchk(&check_param, *(argv++));
     if ((check_param.testflag & T_REP_ANY) != T_REP)
       check_param.testflag&= ~T_REP;
-    VOID(fflush(stdout));
-    VOID(fflush(stderr));
+    (void)fflush(stdout);
+    (void)fflush(stderr);
     if ((check_param.error_printed | check_param.warning_printed) &&
 	(check_param.testflag & T_FORCE_CREATE) &&
 	(!(check_param.testflag & (T_REP | T_REP_BY_SORT | T_SORT_RECORDS |
@@ -112,15 +112,15 @@
       check_param.testflag&= ~T_EXTEND;			/* Don't needed  */
       error|=myisamchk(&check_param, argv[-1]);
       check_param.testflag= old_testflag;
-      VOID(fflush(stdout));
-      VOID(fflush(stderr));
+      (void)fflush(stdout);
+      (void)fflush(stderr);
     }
     else
       error|=new_error;
     if (argc && (!(check_param.testflag & T_SILENT) || check_param.testflag & T_INFO))
     {
       puts("\n---------\n");
-      VOID(fflush(stdout));
+      (void)fflush(stdout);
     }
   }
   if (check_param.total_files > 1)
@@ -761,7 +761,7 @@
   if ((check_param.testflag & T_UNPACK) &&
       (check_param.testflag & (T_QUICK | T_SORT_RECORDS)))
   {
-    VOID(fprintf(stderr,
+    (void)(fprintf(stderr,
 		 "%s: --unpack can't be used with --quick or --sort-records\n",
 		 my_progname_short));
     exit(1);
@@ -771,7 +771,7 @@
        (T_REP_ANY | T_STATISTICS | T_AUTO_INC |
 	T_SORT_RECORDS | T_SORT_INDEX | T_FORCE_CREATE)))
   {
-    VOID(fprintf(stderr,
+    (void)(fprintf(stderr,
 		 "%s: Can't use --readonly when repairing or sorting\n",
 		 my_progname_short));
     exit(1);
@@ -927,7 +927,7 @@
       param->language= set_collation->number;
     if (recreate_table(param, &info,filename))
     {
-      VOID(fprintf(stderr,
+      (void)(fprintf(stderr,
 		   "MyISAM-table '%s' is not fixed because of errors\n",
 	      filename));
       return(-1);
@@ -1029,7 +1029,7 @@
 #ifndef TO_BE_REMOVED
 	if (param->out_flag & O_NEW_DATA)
 	{			/* Change temp file to org file */
-	  VOID(my_close(info->dfile,MYF(MY_WME))); /* Close new file */
+	  (void)my_close(info->dfile,MYF(MY_WME)); /* Close new file */
 	  error|=change_to_newfile(filename,MI_NAME_DEXT,DATA_TMP_EXT,
 				   raid_chunks,
 				   MYF(0));
@@ -1100,9 +1100,9 @@
 	  !(param->testflag & (T_FAST | T_FORCE_CREATE)))
       {
 	if (param->testflag & (T_EXTEND | T_MEDIUM))
-	  VOID(init_key_cache(dflt_key_cache,opt_key_cache_block_size,
+	  (void)(init_key_cache(dflt_key_cache,opt_key_cache_block_size,
                               param->use_buffers, 0, 0));
-	VOID(init_io_cache(&param->read_cache,datafile,
+	(void)(init_io_cache(&param->read_cache,datafile,
 			   (uint) param->read_buffer_length,
 			   READ_CACHE,
 			   (param->start_check_pos ?
@@ -1116,7 +1116,7 @@
 	    (param->testflag & (T_EXTEND | T_MEDIUM)))
 	  error|=chk_data_link(param, info, param->testflag & T_EXTEND);
 	error|=flush_blocks(param, share->key_cache, share->kfile);
-	VOID(end_io_cache(&param->read_cache));
+	(void)end_io_cache(&param->read_cache);
       }
       if (!error)
       {
@@ -1149,7 +1149,7 @@
 				(state_updated ? UPDATE_STAT : 0) |
 				((param->testflag & T_SORT_RECORDS) ?
 				 UPDATE_SORT : 0)));
-    VOID(lock_file(param, share->kfile,0L,F_UNLCK,"indexfile",filename));
+    (void)lock_file(param, share->kfile,0L,F_UNLCK,"indexfile",filename);
     info->update&= ~HA_STATE_CHANGED;
   }
   mi_lock_database(info, F_UNLCK);
@@ -1170,30 +1170,30 @@
       error|=change_to_newfile(filename,MI_NAME_IEXT,INDEX_TMP_EXT,0,
 			       MYF(0));
   }
-  VOID(fflush(stdout)); VOID(fflush(stderr));
+  (void)fflush(stdout); (void)fflush(stderr);
   if (param->error_printed)
   {
     if (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX))
     {
-      VOID(fprintf(stderr,
+      (void)(fprintf(stderr,
 		   "MyISAM-table '%s' is not fixed because of errors\n",
 		   filename));
       if (param->testflag & T_REP_ANY)
-	VOID(fprintf(stderr,
+	(void)(fprintf(stderr,
 		     "Try fixing it by using the --safe-recover (-o), the --force (-f) option or by not using the --quick (-q) flag\n"));
     }
     else if (!(param->error_printed & 2) &&
 	     !(param->testflag & T_FORCE_CREATE))
-      VOID(fprintf(stderr,
+      (void)(fprintf(stderr,
       "MyISAM-table '%s' is corrupted\nFix it using switch \"-r\" or \"-o\"\n",
 	      filename));
   }
   else if (param->warning_printed &&
 	   ! (param->testflag & (T_REP_ANY | T_SORT_RECORDS | T_SORT_INDEX |
 			  T_FORCE_CREATE)))
-    VOID(fprintf(stderr, "MyISAM-table '%s' is usable but should be fixed\n",
+    (void)(fprintf(stderr, "MyISAM-table '%s' is usable but should be fixed\n",
 		 filename));
-  VOID(fflush(stderr));
+  (void)fflush(stderr);
   DBUG_RETURN(error);
 } /* myisamchk */
 
@@ -1320,7 +1320,7 @@
   printf("Key Start Len Index   Type");
   if (param->testflag & T_VERBOSE)
     printf("                     Rec/key         Root  Blocksize");
-  VOID(putchar('\n'));
+  (void)putchar('\n');
 
   for (key=keyseg_nr=0, keyinfo= &share->keyinfo[0] ;
        key < share->base.keys;
@@ -1359,7 +1359,7 @@
       printf("%11lu %12s %10d",
 	     share->state.rec_per_key_part[keyseg_nr++],
 	     buff,keyinfo->block_length);
-    VOID(putchar('\n'));
+    (void)putchar('\n');
     while ((++keyseg)->type != HA_KEYTYPE_END)
     {
       pos=buff;
@@ -1378,7 +1378,7 @@
 	     (long) keyseg->start+1,keyseg->length,buff);
       if (param->testflag & T_VERBOSE)
 	printf("%11lu", share->state.rec_per_key_part[keyseg_nr++]);
-      VOID(putchar('\n'));
+      (void)putchar('\n');
     }
     keyseg++;
   }
@@ -1416,7 +1416,7 @@
     printf("\nField Start Length Nullpos Nullbit Type");
     if (share->options & HA_OPTION_COMPRESS_RECORD)
       printf("                         Huff tree  Bits");
-    VOID(putchar('\n'));
+    (void)putchar('\n');
     start=1;
     for (field=0 ; field < share->base.fields ; field++)
     {
@@ -1455,7 +1455,7 @@
 		 (uint) (share->rec[field].huff_tree-share->decode_trees)+1,
 		 share->rec[field].huff_tree->quick_table_bits);
       }
-      VOID(putchar('\n'));
+      (void)putchar('\n');
       start+=share->rec[field].length;
     }
   }
@@ -1603,7 +1603,7 @@
     goto err;
   }
 
-  VOID(my_close(info->dfile,MYF(MY_WME)));
+  (void)my_close(info->dfile,MYF(MY_WME));
   param->out_flag|=O_NEW_DATA;			/* Data in new file */
   info->dfile=new_file;				/* Use new datafile */
   info->state->del=0;
@@ -1617,14 +1617,14 @@
 
   if (param->testflag & T_WRITE_LOOP)
   {
-    VOID(fputs("          \r",stdout)); VOID(fflush(stdout));
+    (void)fputs("          \r",stdout); (void)fflush(stdout);
   }
   got_error=0;
 
 err:
   if (got_error && new_file >= 0)
   {
-    VOID(end_io_cache(&info->rec_cache));
+    (void)end_io_cache(&info->rec_cache);
     (void) my_close(new_file,MYF(MY_WME));
     (void) my_raid_delete(param->temp_filename, share->base.raid_chunks,
 			  MYF(MY_WME));
@@ -1635,7 +1635,7 @@
   }
   my_free(sort_param.record,MYF(MY_ALLOW_ZERO_PTR));
   info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
-  VOID(end_io_cache(&info->rec_cache));
+  (void)end_io_cache(&info->rec_cache);
   my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR));
   sort_info.buff=0;
   share->state.sortkey=sort_key;
@@ -1759,8 +1759,8 @@
   va_list args;
 
   va_start(args,fmt);
-  VOID(vfprintf(stdout, fmt, args));
-  VOID(fputc('\n',stdout));
+  (void)vfprintf(stdout, fmt, args);
+  (void)fputc('\n',stdout);
   va_end(args);
 }
 
@@ -1782,8 +1782,8 @@
   param->warning_printed=1;
   va_start(args,fmt);
   fprintf(stderr,"%s: warning: ",my_progname_short);
-  VOID(vfprintf(stderr, fmt, args));
-  VOID(fputc('\n',stderr));
+  (void)vfprintf(stderr, fmt, args);
+  (void)fputc('\n',stderr);
   fflush(stderr);
   va_end(args);
   DBUG_VOID_RETURN;
@@ -1807,8 +1807,8 @@
   param->error_printed|=1;
   va_start(args,fmt);
   fprintf(stderr,"%s: error: ",my_progname_short);
-  VOID(vfprintf(stderr, fmt, args));
-  VOID(fputc('\n',stderr));
+  (void)vfprintf(stderr, fmt, args);
+  (void)fputc('\n',stderr);
   fflush(stderr);
   va_end(args);
   DBUG_VOID_RETURN;
===== storage/myisam/myisamlog.c 1.39 vs edited =====
--- 1.39/storage/myisam/myisamlog.c	2007-10-12 18:03:01 +02:00
+++ edited/storage/myisam/myisamlog.c	2007-11-03 17:02:59 +01:00
@@ -121,7 +121,7 @@
   if (re_open_count)
     printf("Had to do %d re-open because of too few possibly open files\n",
 	   re_open_count);
-  VOID(mi_panic(HA_PANIC_CLOSE));
+  (void)mi_panic(HA_PANIC_CLOSE);
   my_free_open_file_info();
   my_end(test_info ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
   exit(error);
@@ -292,7 +292,7 @@
   }
   return;
  err:
-  VOID(fprintf(stderr,"option \"%c\" used without or with wrong argument\n",
+  (void)(fprintf(stderr,"option \"%c\" used without or with wrong argument\n",
 	       option));
   exit(1);
 }
@@ -332,7 +332,7 @@
   bzero((uchar*) com_count,sizeof(com_count));
   init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1,
 	    (tree_element_free) file_info_free, NULL);
-  VOID(init_key_cache(dflt_key_cache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE,
+  (void)(init_key_cache(dflt_key_cache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE,
                       0, 0));
 
   files_open=0; access_time=0;
@@ -412,7 +412,7 @@
       }
       open_param.name=file_info.name;
       open_param.max_id=0;
-      VOID(tree_walk(&tree,(tree_walk_action) test_if_open,(void*) &open_param,
+      (void)(tree_walk(&tree,(tree_walk_action) test_if_open,(void*) &open_param,
 		     left_root_right));
       file_info.id=open_param.max_id+1;
       /*
@@ -458,7 +458,7 @@
 	files_open++;
 	file_info.closed=0;
       }
-      VOID(tree_insert(&tree, (uchar*) &file_info, 0, tree.custom_arg));
+      (void)tree_insert(&tree, (uchar*) &file_info, 0, tree.custom_arg);
       if (file_info.used)
       {
 	if (verbose && !record_pos_file)
@@ -477,7 +477,7 @@
       {
 	if (!curr_file_info->closed)
 	  files_open--;
-        VOID(tree_delete(&tree, (uchar*) curr_file_info, 0, tree.custom_arg));
+        (void)tree_delete(&tree, (uchar*) curr_file_info, 0, tree.custom_arg);
       }
       break;
     case MI_LOG_EXTRA:
@@ -493,7 +493,7 @@
 	if (mi_extra(curr_file_info->isam, extra_command, 0) != (int) result)
 	{
 	  fflush(stdout);
-	  VOID(fprintf(stderr,
+	  (void)(fprintf(stderr,
 		       "Warning: error %d, expected %d on command %s at %s\n",
 		       my_errno,result,command_name[command],
 		       llstr(isamlog_filepos,llbuff)));
@@ -641,7 +641,7 @@
       break;
     default:
       fflush(stdout);
-      VOID(fprintf(stderr,
+      (void)(fprintf(stderr,
 		   "Error: found unknown command %d in logfile, aborted\n",
 		   command));
       fflush(stderr);
@@ -650,30 +650,30 @@
   }
   end_key_cache(dflt_key_cache,1);
   delete_tree(&tree);
-  VOID(end_io_cache(&cache));
-  VOID(my_close(file,MYF(0)));
+  (void)end_io_cache(&cache);
+  (void)my_close(file,MYF(0));
   if (write_file && my_fclose(write_file,MYF(MY_WME)))
     DBUG_RETURN(1);
   DBUG_RETURN(0);
 
  err:
   fflush(stdout);
-  VOID(fprintf(stderr,"Got error %d when reading from logfile\n",my_errno));
+  (void)fprintf(stderr,"Got error %d when reading from logfile\n",my_errno);
   fflush(stderr);
   goto end;
  com_err:
   fflush(stdout);
-  VOID(fprintf(stderr,"Got error %d, expected %d on command %s at %s\n",
+  (void)(fprintf(stderr,"Got error %d, expected %d on command %s at %s\n",
 	       my_errno,result,command_name[command],
 	       llstr(isamlog_filepos,llbuff)));
   fflush(stderr);
  end:
   end_key_cache(dflt_key_cache, 1);
   delete_tree(&tree);
-  VOID(end_io_cache(&cache));
-  VOID(my_close(file,MYF(0)));
+  (void)end_io_cache(&cache);
+  (void)my_close(file,MYF(0));
   if (write_file)
-    VOID(my_fclose(write_file,MYF(MY_WME)));
+    (void)my_fclose(write_file,MYF(MY_WME));
   DBUG_RETURN(1);
 }
 
@@ -757,7 +757,7 @@
   if (update)
   {
     if (!fileinfo->closed)
-      VOID(mi_close(fileinfo->isam));
+      (void)mi_close(fileinfo->isam);
     if (fileinfo->record)
       my_free(fileinfo->record,MYF(0));
   }
@@ -775,7 +775,7 @@
   access_param.min_accessed=LONG_MAX;
   access_param.found=0;
 
-  VOID(tree_walk(tree,(tree_walk_action) test_when_accessed,
+  (void)(tree_walk(tree,(tree_walk_action) test_when_accessed,
 		 (void*) &access_param,left_root_right));
   if (!access_param.found)
     return 1;			/* No open file that is possibly to close */
@@ -815,7 +815,7 @@
     if (mi_is_key_active(info->s->state.key_map, key) &&
 	info->s->keyinfo[key].flag & HA_NOSAME)
     {
-      VOID(_mi_make_key(info,key,tmp_key,record,0L));
+      (void)_mi_make_key(info,key,tmp_key,record,0L);
       return mi_rkey(info,file_info->record,(int) key,tmp_key,0,
 		     HA_READ_KEY_EXACT);
     }
===== storage/myisam/myisampack.c 1.67 vs edited =====
--- 1.67/storage/myisam/myisampack.c	2007-10-12 18:03:01 +02:00
+++ edited/storage/myisam/myisampack.c	2007-11-03 17:02:59 +01:00
@@ -238,8 +238,8 @@
   }
   if (ok && isamchk_neaded && !silent)
     puts("Remember to run myisamchk -rq on compressed tables");
-  VOID(fflush(stdout));
-  VOID(fflush(stderr));
+  (void)fflush(stdout);
+  (void)fflush(stderr);
   free_defaults(default_argv);
   my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
   exit(error ? 2 : 0);
@@ -291,7 +291,7 @@
 
 static void print_version(void)
 {
-  VOID(printf("%s Ver 1.23 for %s on %s\n",
+  (void)(printf("%s Ver 1.23 for %s on %s\n",
               my_progname, SYSTEM_TYPE, MACHINE_TYPE));
   NETWARE_SET_SCREEN_MODE(1);
 }
@@ -309,7 +309,7 @@
   puts("afterwards to update the keys.");
   puts("You should give the .MYI file as the filename argument.");
 
-  VOID(printf("\nUsage: %s [OPTIONS] filename...\n", my_progname));
+  (void)printf("\nUsage: %s [OPTIONS] filename...\n", my_progname);
   my_print_help(my_long_options);
   print_defaults("my", load_default_groups);
   my_print_variables(my_long_options);
@@ -407,7 +407,7 @@
 			  (opt_wait ? HA_OPEN_WAIT_IF_LOCKED :
 			   HA_OPEN_ABORT_IF_LOCKED))))
   {
-    VOID(fprintf(stderr, "%s gave error %d on open\n", name, my_errno));
+    (void)fprintf(stderr, "%s gave error %d on open\n", name, my_errno);
     DBUG_RETURN(0);
   }
   share=isam_file->s;
@@ -415,8 +415,8 @@
   {
     if (!force_pack)
     {
-      VOID(fprintf(stderr, "%s is already compressed\n", name));
-      VOID(mi_close(isam_file));
+      (void)fprintf(stderr, "%s is already compressed\n", name);
+      (void)mi_close(isam_file);
       DBUG_RETURN(0);
     }
     if (verbose)
@@ -427,11 +427,11 @@
       (share->state.state.records <= 1 ||
        share->state.state.data_file_length < 1024))
   {
-    VOID(fprintf(stderr, "%s is too small to compress\n", name));
-    VOID(mi_close(isam_file));
+    (void)fprintf(stderr, "%s is too small to compress\n", name);
+    (void)mi_close(isam_file);
     DBUG_RETURN(0);
   }
-  VOID(mi_lock_database(isam_file,F_WRLCK));
+  (void)mi_lock_database(isam_file,F_WRLCK);
   DBUG_RETURN(isam_file);
 }
 
@@ -473,7 +473,7 @@
   return 0;
 
  diff_file:
-  VOID(fprintf(stderr, "%s: Tables '%s' and '%s' are not identical\n",
+  (void)(fprintf(stderr, "%s: Tables '%s' and '%s' are not identical\n",
                my_progname, names[j], names[j+1]));
  error:
   while (i--)
@@ -506,16 +506,16 @@
   /* Create temporary or join file */
 
   if (backup)
-    VOID(fn_format(org_name,isam_file->filename,"",MI_NAME_DEXT,2));
+    (void)fn_format(org_name,isam_file->filename,"",MI_NAME_DEXT,2);
   else
-    VOID(fn_format(org_name,isam_file->filename,"",MI_NAME_DEXT,2+4+16));
+    (void)fn_format(org_name,isam_file->filename,"",MI_NAME_DEXT,2+4+16);
   if (!test_only && result_table)
   {
     /* Make a new indexfile based on first file in list */
     uint length;
     uchar *buff;
     strmov(org_name,result_table);		/* Fix error messages */
-    VOID(fn_format(new_name,result_table,"",MI_NAME_IEXT,2));
+    (void)fn_format(new_name,result_table,"",MI_NAME_IEXT,2);
     if ((join_isam_file=my_create(new_name,0,tmpfile_createflag,MYF(MY_WME)))
 	< 0)
       goto err;
@@ -530,12 +530,12 @@
       goto err;
     }
     my_free(buff,MYF(0));
-    VOID(fn_format(new_name,result_table,"",MI_NAME_DEXT,2));
+    (void)fn_format(new_name,result_table,"",MI_NAME_DEXT,2);
   }
   else if (!tmp_dir[0])
-    VOID(make_new_name(new_name,org_name));
+    (void)make_new_name(new_name,org_name);
   else
-    VOID(fn_format(new_name,org_name,tmp_dir,DATA_TMP_EXT,1+2+4));
+    (void)fn_format(new_name,org_name,tmp_dir,DATA_TMP_EXT,1+2+4);
   if (!test_only &&
       (new_file=my_create(new_name,0,tmpfile_createflag,MYF(MY_WME))) < 0)
     goto err;
@@ -551,7 +551,7 @@
                       (ulong) mrg->records));
   if (write_loop || verbose)
   {
-    VOID(printf("Compressing %s: (%lu records)\n",
+    (void)(printf("Compressing %s: (%lu records)\n",
                 result_table ? new_name : org_name, (ulong) mrg->records));
   }
   trees=fields=share->base.fields;
@@ -563,7 +563,7 @@
   */
   DBUG_PRINT("info", ("- Calculating statistics"));
   if (write_loop || verbose)
-    VOID(printf("- Calculating statistics\n"));
+    (void)printf("- Calculating statistics\n");
   if (get_statistic(mrg,huff_counts))
     goto err;
   NORMAL_SAFEMALLOC;
@@ -613,7 +613,7 @@
   */
   file_buffer.pos_in_file=HEAD_LENGTH;
   if (! test_only)
-    VOID(my_seek(new_file,file_buffer.pos_in_file,MY_SEEK_SET,MYF(0)));
+    (void)my_seek(new_file,file_buffer.pos_in_file,MY_SEEK_SET,MYF(0));
 
   /*
     Write field infos: field type, pack type, length bits, tree number.
@@ -639,7 +639,7 @@
   */
   DBUG_PRINT("info", ("- Compressing file"));
   if (write_loop || verbose)
-    VOID(printf("- Compressing file\n"));
+    (void)printf("- Compressing file\n");
   error=compress_isam_file(mrg,huff_counts);
   new_length=file_buffer.pos_in_file;
   if (!error && !test_only)
@@ -666,7 +666,7 @@
                       mrg->min_pack_length, mrg->max_pack_length,
                       (ulong) (mrg->records ? (new_length/mrg->records) : 0)));
   if (verbose && mrg->records)
-    VOID(printf("Min record length: %6d   Max length: %6d   "
+    (void)(printf("Min record length: %6d   Max length: %6d   "
                 "Mean total length: %6ld\n", mrg->min_pack_length,
                 mrg->max_pack_length, (ulong) (new_length/mrg->records)));
 
@@ -704,9 +704,9 @@
 	    error=my_rename(new_name,org_name,MYF(MY_WME));
 	  if (!error)
           {
-	    VOID(my_copystat(temp_name,org_name,MYF(MY_COPYTIME)));
+	    (void)my_copystat(temp_name,org_name,MYF(MY_COPYTIME));
             if (tmp_dir[0])
-              VOID(my_delete(new_name,MYF(MY_WME)));
+              (void)my_delete(new_name,MYF(MY_WME));
           }
 	}
       }
@@ -717,7 +717,7 @@
 	  error=my_copy(new_name,org_name,
 			MYF(MY_WME | MY_HOLD_ORIGINAL_MODES | MY_COPYTIME));
           if (!error)
-            VOID(my_delete(new_name,MYF(MY_WME)));
+            (void)my_delete(new_name,MYF(MY_WME));
         }
 	else
 	  error=my_redel(org_name,new_name,MYF(MY_WME | MY_COPYTIME));
@@ -731,14 +731,14 @@
     error|=my_close(join_isam_file,MYF(MY_WME));
   if (error)
   {
-    VOID(fprintf(stderr, "Aborting: %s is not compressed\n", org_name));
-    VOID(my_delete(new_name,MYF(MY_WME)));
+    (void)fprintf(stderr, "Aborting: %s is not compressed\n", org_name);
+    (void)my_delete(new_name,MYF(MY_WME));
     DBUG_RETURN(-1);
   }
   if (write_loop || verbose)
   {
     if (old_length)
-      VOID(printf("%.4g%%     \n",
+      (void)(printf("%.4g%%     \n",
                   (((longlong) (old_length - new_length)) * 100.0 /
                    (longlong) old_length)));
     else
@@ -749,11 +749,11 @@
  err:
   free_counts_and_tree_and_queue(huff_trees,trees,huff_counts,fields);
   if (new_file >= 0)
-    VOID(my_close(new_file,MYF(0)));
+    (void)my_close(new_file,MYF(0));
   if (join_isam_file >= 0)
-    VOID(my_close(join_isam_file,MYF(0)));
+    (void)my_close(join_isam_file,MYF(0));
   mrg_close(mrg);
-  VOID(fprintf(stderr, "Aborted: %s is not compressed\n", org_name));
+  (void)fprintf(stderr, "Aborted: %s is not compressed\n", org_name);
   DBUG_RETURN(-1);
 }
 
@@ -1069,13 +1069,13 @@
       record_count++;
       if (write_loop && record_count % WRITE_COUNT == 0)
       {
-	VOID(printf("%lu\r", (ulong) record_count));
-        VOID(fflush(stdout));
+	(void)printf("%lu\r", (ulong) record_count);
+        (void)fflush(stdout);
       }
     }
     else if (error != HA_ERR_RECORD_DELETED)
     {
-      VOID(fprintf(stderr, "Got error %d while reading rows", error));
+      (void)fprintf(stderr, "Got error %d while reading rows", error);
       break;
     }
 
@@ -1083,8 +1083,8 @@
   }
   if (write_loop)
   {
-    VOID(printf("            \r"));
-    VOID(fflush(stdout));
+    (void)printf("            \r");
+    (void)fflush(stdout);
   }
 
   /*
@@ -1096,7 +1096,7 @@
   DBUG_PRINT("info", ("Found the following number of incidents "
                       "of the byte codes:"));
   if (verbose >= 2)
-    VOID(printf("Found the following number of incidents "
+    (void)(printf("Found the following number of incidents "
                 "of the byte codes:\n"));
   for (count= huff_counts ; count < end_count; count++)
   {
@@ -1106,14 +1106,14 @@
 
     DBUG_PRINT("info", ("column: %3u", (uint) (count - huff_counts + 1)));
     if (verbose >= 2)
-      VOID(printf("column: %3u\n", (uint) (count - huff_counts + 1)));
+      (void)printf("column: %3u\n", (uint) (count - huff_counts + 1));
     if (count->tree_buff)
     {
       DBUG_PRINT("info", ("number of distinct values: %u",
                           (uint) ((count->tree_pos - count->tree_buff) /
                                   count->field_length)));
       if (verbose >= 2)
-        VOID(printf("number of distinct values: %u\n",
+        (void)(printf("number of distinct values: %u\n",
                     (uint) ((count->tree_pos - count->tree_buff) /
                             count->field_length)));
     }
@@ -1126,7 +1126,7 @@
         DBUG_PRINT("info", ("counts[0x%02x]: %12s", idx,
                             llstr((longlong) count->counts[idx], llbuf)));
         if (verbose >= 2)
-          VOID(printf("counts[0x%02x]: %12s\n", idx,
+          (void)(printf("counts[0x%02x]: %12s\n", idx,
                       llstr((longlong) count->counts[idx], llbuf)));
       }
     }
@@ -1134,7 +1134,7 @@
                                                     llbuf)));
     if ((verbose >= 2) && total_count)
     {
-      VOID(printf("total:        %12s\n",
+      (void)(printf("total:        %12s\n",
                   llstr((longlong) total_count, llbuf)));
     }
   }
@@ -1352,7 +1352,7 @@
                       field_count[FIELD_INTERVALL],
                       field_count[FIELD_ZERO]));
   if (verbose)
-    VOID(printf("\nnormal:    %3d  empty-space:     %3d  "
+    (void)(printf("\nnormal:    %3d  empty-space:     %3d  "
                 "empty-zero:       %3d  empty-fill: %3d\n"
                 "pre-space: %3d  end-space:       %3d  "
                 "intervall-fields: %3d  zero:       %3d\n",
@@ -1876,7 +1876,7 @@
   DBUG_PRINT("info", ("Original trees:  %d  After join: %d",
                       trees, tree_number));
   if (verbose)
-    VOID(printf("Original trees:  %d  After join: %d\n", trees, tree_number));
+    (void)printf("Original trees:  %d  After join: %d\n", trees, tree_number);
   return tree_number;			/* Return trees left */
 }
 
@@ -2022,7 +2022,7 @@
   buff[27]= (uchar) mi_get_pointer_length((ulonglong) filelength,2);
   if (test_only)
     return 0;
-  VOID(my_seek(file_buffer.file,0L,MY_SEEK_SET,MYF(0)));
+  (void)my_seek(file_buffer.file,0L,MY_SEEK_SET,MYF(0));
   return my_write(file_buffer.file,(const uchar *) file_buffer.pos,HEAD_LENGTH,
 		  MYF(MY_WME | MY_NABP | MY_WAIT_IF_FULL)) != 0;
 }
@@ -2055,24 +2055,24 @@
   DBUG_PRINT("info", (" "));
   if (verbose >= 2)
   {
-    VOID(printf("\n"));
-    VOID(printf("column types:\n"));
-    VOID(printf("FIELD_NORMAL          0\n"));
-    VOID(printf("FIELD_SKIP_ENDSPACE   1\n"));
-    VOID(printf("FIELD_SKIP_PRESPACE   2\n"));
-    VOID(printf("FIELD_SKIP_ZERO       3\n"));
-    VOID(printf("FIELD_BLOB            4\n"));
-    VOID(printf("FIELD_CONSTANT        5\n"));
-    VOID(printf("FIELD_INTERVALL       6\n"));
-    VOID(printf("FIELD_ZERO            7\n"));
-    VOID(printf("FIELD_VARCHAR         8\n"));
-    VOID(printf("FIELD_CHECK           9\n"));
-    VOID(printf("\n"));
-    VOID(printf("pack type as a set of flags:\n"));
-    VOID(printf("PACK_TYPE_SELECTED      1\n"));
-    VOID(printf("PACK_TYPE_SPACE_FIELDS  2\n"));
-    VOID(printf("PACK_TYPE_ZERO_FILL     4\n"));
-    VOID(printf("\n"));
+    (void)printf("\n");
+    (void)printf("column types:\n");
+    (void)printf("FIELD_NORMAL          0\n");
+    (void)printf("FIELD_SKIP_ENDSPACE   1\n");
+    (void)printf("FIELD_SKIP_PRESPACE   2\n");
+    (void)printf("FIELD_SKIP_ZERO       3\n");
+    (void)printf("FIELD_BLOB            4\n");
+    (void)printf("FIELD_CONSTANT        5\n");
+    (void)printf("FIELD_INTERVALL       6\n");
+    (void)printf("FIELD_ZERO            7\n");
+    (void)printf("FIELD_VARCHAR         8\n");
+    (void)printf("FIELD_CHECK           9\n");
+    (void)printf("\n");
+    (void)printf("pack type as a set of flags:\n");
+    (void)printf("PACK_TYPE_SELECTED      1\n");
+    (void)printf("PACK_TYPE_SPACE_FIELDS  2\n");
+    (void)printf("PACK_TYPE_ZERO_FILL     4\n");
+    (void)printf("\n");
   }
   for (i=0 ; i++ < fields ; counts++)
   {
@@ -2089,7 +2089,7 @@
                         counts->max_zero_fill, counts->length_bits,
                         counts->tree->tree_number, counts->field_length));
     if (verbose >= 2)
-      VOID(printf("column: %3u  type: %2u  pack: %2u  zero: %4u  lbits: %2u  "
+      (void)(printf("column: %3u  type: %2u  pack: %2u  zero: %4u  lbits: %2u  "
                   "tree: %2u  length: %4u\n", i , counts->field_type,
                   counts->pack_type, counts->max_zero_fill, counts->length_bits,
                   counts->tree->tree_number, counts->field_length));
@@ -2127,7 +2127,7 @@
 
   DBUG_PRINT("info", (" "));
   if (verbose >= 2)
-    VOID(printf("\n"));
+    (void)printf("\n");
   tree_no= 0;
   intervall_length=0;
   for (elements=0; trees-- ; huff_tree++)
@@ -2138,7 +2138,7 @@
     tree_no++;
     DBUG_PRINT("info", (" "));
     if (verbose >= 3)
-      VOID(printf("\n"));
+      (void)printf("\n");
     /* Count the total number of elements (byte codes or column values). */
     elements+=huff_tree->elements;
     huff_tree->max_offset=2;
@@ -2157,7 +2157,7 @@
     */
     if (huff_tree->max_offset >= IS_OFFSET)
     {				/* This should be impossible */
-      VOID(fprintf(stderr, "Tree offset got too big: %d, aborted\n",
+      (void)(fprintf(stderr, "Tree offset got too big: %d, aborted\n",
                    huff_tree->max_offset));
       my_afree((uchar*) packed_tree);
       return 0;
@@ -2197,7 +2197,7 @@
                         "bufflen" : "min_chr", huff_tree->counts->tree_buff ?
                         int_length : huff_tree->min_chr, huff_tree->height));
     if (verbose >= 2)
-      VOID(printf("tree: %2u  elements: %4u  char_bits: %2u  offset_bits: %2u  "
+      (void)(printf("tree: %2u  elements: %4u  char_bits: %2u  offset_bits: %2u  "
                   "%s: %5u  codelen: %2u\n", tree_no, huff_tree->elements,
                   huff_tree->char_bits, huff_tree->offset_bits,
                   huff_tree->counts->tree_buff ? "bufflen" : "min_chr",
@@ -2208,7 +2208,7 @@
     length=(uint) (offset-packed_tree);
     if (length != huff_tree->elements*2-2)
     {
-      VOID(fprintf(stderr, "error: Huff-tree-length: %d != calc_length: %d\n",
+      (void)(fprintf(stderr, "error: Huff-tree-length: %d != calc_length: %d\n",
                    length, huff_tree->elements * 2 - 2));
       errors++;
       break;
@@ -2226,7 +2226,7 @@
                           " -> " : "", (packed_tree[i] & IS_OFFSET) ?
                           packed_tree[i] - IS_OFFSET + i : packed_tree[i]));
       if (verbose >= 3)
-        VOID(printf("tree[0x%04x]: %s0x%04x\n",
+        (void)(printf("tree[0x%04x]: %s0x%04x\n",
                     i, (packed_tree[i] & IS_OFFSET) ? " -> " : "",
                     (packed_tree[i] & IS_OFFSET) ?
                     packed_tree[i] - IS_OFFSET + i : packed_tree[i]));
@@ -2251,7 +2251,7 @@
                           bindigits(huff_tree->code[i],
                                     huff_tree->code_len[i])));
       if (verbose >= 3)
-        VOID(printf("code[0x%04x]:      0x%s  bits: %2u  bin: %s\n", i,
+        (void)(printf("code[0x%04x]:      0x%s  bits: %2u  bin: %s\n", i,
                     hexdigits(huff_tree->code[i]), huff_tree->code_len[i],
                     bindigits(huff_tree->code[i], huff_tree->code_len[i])));
 
@@ -2266,8 +2266,8 @@
       {
         if (! len)
         {
-          VOID(fflush(stdout));
-          VOID(fprintf(stderr, "error: code 0x%s with %u bits not found\n",
+          (void)fflush(stdout);
+          (void)(fprintf(stderr, "error: code 0x%s with %u bits not found\n",
                        hexdigits(huff_tree->code[i]), huff_tree->code_len[i]));
           errors++;
           break;
@@ -2277,8 +2277,8 @@
         bits++;
         if (bits > 8 * sizeof(code))
         {
-          VOID(fflush(stdout));
-          VOID(fprintf(stderr, "error: Huffman code too long: %u/%u\n",
+          (void)fflush(stdout);
+          (void)(fprintf(stderr, "error: Huffman code too long: %u/%u\n",
                        bits, (uint) (8 * sizeof(code))));
           errors++;
           break;
@@ -2286,8 +2286,8 @@
         idx+= (uint) code & 1;
         if (idx >= length)
         {
-          VOID(fflush(stdout));
-          VOID(fprintf(stderr, "error: illegal tree offset: %u/%u\n",
+          (void)fflush(stdout);
+          (void)(fprintf(stderr, "error: illegal tree offset: %u/%u\n",
                        idx, length));
           errors++;
           break;
@@ -2303,8 +2303,8 @@
       DBUG_EXECUTE_IF("forcechkerr4", packed_tree[idx]++;);
       if (packed_tree[idx] != i)
       {
-        VOID(fflush(stdout));
-        VOID(fprintf(stderr, "error: decoded value 0x%04x  should be: 0x%04x\n",
+        (void)fflush(stdout);
+        (void)(fprintf(stderr, "error: decoded value 0x%04x  should be: 0x%04x\n",
                      packed_tree[idx], i));
         errors++;
         break;
@@ -2322,7 +2322,7 @@
         DBUG_PRINT("info", ("column_values[0x%04x]: 0x%02x",
                             i, (uchar) huff_tree->counts->tree_buff[i]));
         if (verbose >= 3)
-          VOID(printf("column_values[0x%04x]: 0x%02x\n",
+          (void)(printf("column_values[0x%04x]: 0x%02x\n",
                       i, (uchar) huff_tree->counts->tree_buff[i]));
       }
     }
@@ -2330,11 +2330,11 @@
   }
   DBUG_PRINT("info", (" "));
   if (verbose >= 2)
-    VOID(printf("\n"));
+    (void)printf("\n");
   my_afree((uchar*) packed_tree);
   if (errors)
   {
-    VOID(fprintf(stderr, "Error: Generated decode trees are corrupt. Stop.\n"));
+    (void)fprintf(stderr, "Error: Generated decode trees are corrupt. Stop.\n");
     return 0;
   }
   return elements;
@@ -2756,8 +2756,8 @@
       record_count++;
       if (write_loop && record_count % WRITE_COUNT == 0)
       {
-	VOID(printf("%lu\r", (ulong) record_count));
-        VOID(fflush(stdout));
+	(void)printf("%lu\r", (ulong) record_count);
+        (void)fflush(stdout);
       }
     }
     else if (error != HA_ERR_RECORD_DELETED)
@@ -2767,11 +2767,11 @@
     error=0;
   else
   {
-    VOID(fprintf(stderr, "%s: Got error %d reading records\n",
+    (void)(fprintf(stderr, "%s: Got error %d reading records\n",
                  my_progname, error));
   }
   if (verbose >= 2)
-    VOID(printf("wrote %s records.\n", llstr((longlong) record_count, llbuf)));
+    (void)printf("wrote %s records.\n", llstr((longlong) record_count, llbuf));
 
   my_afree((uchar*) record);
   mrg->ref_length=max_pack_length;
@@ -2901,7 +2901,7 @@
     if (bits != 8 * sizeof(value))
       value&= (((ulonglong) 1) << bits) - 1;
     if (file_buffer.pos >= file_buffer.end)
-      VOID(flush_buffer(~ (ulong) 0));
+      (void)flush_buffer(~ (ulong) 0);
     file_buffer.bits=(int) (BITS_SAVED - bits);
     file_buffer.bitbucket= value << (BITS_SAVED - bits);
   }
@@ -2924,7 +2924,7 @@
     *file_buffer.pos++= (uchar) (bit_buffer >> bits);
   }
   if (file_buffer.pos >= file_buffer.end)
-    VOID(flush_buffer(~ (ulong) 0));
+    (void)flush_buffer(~ (ulong) 0);
   file_buffer.bits= BITS_SAVED;
   file_buffer.bitbucket= 0;
 }
@@ -2974,7 +2974,7 @@
   share->changed=1;			/* Force write of header */
   share->state.open_count=0;
   share->global_changed=0;
-  VOID(my_chsize(share->kfile, share->base.keystart, 0, MYF(0)));
+  (void)my_chsize(share->kfile, share->base.keystart, 0, MYF(0));
   if (share->base.keys)
     isamchk_neaded=1;
   DBUG_RETURN(mi_state_info_write(share->kfile,&share->state,1+2));
===== storage/myisam/sort.c 1.73 vs edited =====
--- 1.73/storage/myisam/sort.c	2007-10-16 17:23:38 +02:00
+++ edited/storage/myisam/sort.c	2007-11-03 17:03:02 +01:00
@@ -961,7 +961,7 @@
           uchar *base=buffpek->base;
           uint max_keys=buffpek->max_keys;
 
-          VOID(queue_remove(&queue,0));
+          (void)queue_remove(&queue,0);
 
           /* Put room used by buffer to use in other buffer */
           for (refpek= (BUFFPEK**) &queue_top(&queue);
===== storage/myisammrg/myrg_create.c 1.16 vs edited =====
--- 1.16/storage/myisammrg/myrg_create.c	2007-08-13 15:11:17 +02:00
+++ edited/storage/myisammrg/myrg_create.c	2007-11-03 17:03:03 +01:00
@@ -66,7 +66,7 @@
   save_errno=my_errno ? my_errno : -1;
   switch (errpos) {
   case 1:
-    VOID(my_close(file,MYF(0)));
+    (void)my_close(file,MYF(0));
   }
   DBUG_RETURN(my_errno=save_errno);
 } /* myrg_create */
===== storage/myisammrg/myrg_open.c 1.38 vs edited =====
--- 1.38/storage/myisammrg/myrg_open.c	2007-06-07 10:39:11 +02:00
+++ edited/storage/myisammrg/myrg_open.c	2007-11-03 17:03:05 +01:00
@@ -83,9 +83,9 @@
 
     if (!has_path(buff))
     {
-      VOID(strmake(name_buff+dir_length,buff,
+      (void)(strmake(name_buff+dir_length,buff,
                    sizeof(name_buff)-1-dir_length));
-      VOID(cleanup_dirname(buff,name_buff));
+      (void)cleanup_dirname(buff,name_buff);
     }
     else
       fn_format(buff, buff, "", "", 0);
@@ -164,7 +164,7 @@
   m_info->end_table=m_info->open_tables+files;
   m_info->last_used_table=m_info->open_tables;
 
-  VOID(my_close(fd,MYF(0)));
+  (void)my_close(fd,MYF(0));
   end_io_cache(&file);
   m_info->open_list.data=(void*) m_info;
   pthread_mutex_lock(&THR_LOCK_open);
@@ -184,7 +184,7 @@
     end_io_cache(&file);
     /* Fall through */
   case 1:
-    VOID(my_close(fd,MYF(0)));
+    (void)my_close(fd,MYF(0));
   }
   my_errno=save_errno;
   DBUG_RETURN (NULL);