Merge

mysys/base64.c:
  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.

1 files changed, 4 insertions, 3 deletions

diff --git a/mysys/base64.c b/mysys/base64.c
index c521f352690..b29c8ff8360 100644
--- a/mysys/base64.c
+++ b/mysys/base64.c
@@ -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 @@ base64_decode(const char *src, size_t size, void *dst)
 {
   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 @@ base64_decode(const char *src, size_t size, void *dst)
   {
     return -1;
   }
-  return d - (unsigned char*)dst;
+  return d - dst_base;
 }