bk commit into 5.0 tree (kent:1.1967)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1967 05/11/03 11:50:38 kent@stripped +1 -0
  Merge

  mysys/base64.c
    1.12 05/11/03 11:49:04 kent@stripped +0 -2
    At least one compiler don't like to use casted
    void* var in address calculation, assign void*
    var to char* var and use that one instead.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-7d4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.11/mysys/base64.c	2005-11-02 15:04:11 +01:00
+++ 1.12/mysys/base64.c	2005-11-03 11:49:04 +01:00
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <base64.h>
-#include <m_string.h>  // strchr()
+#include <m_string.h>  /* strchr() */
 
 #ifndef MAIN
 
@@ -134,7 +134,8 @@
 {
   char b[3];
   size_t i= 0;
-  unsigned char *d= (unsigned char*)dst;
+  char *dst_base= (char *)dst;
+  char *d= dst_base;
   size_t j;
 
   while (i < size)
@@ -193,7 +194,7 @@
   {
     return -1;
   }
-  return d - (unsigned char*)dst;
+  return d - dst_base;
 }