Reapplied portability changes, from changesets by kent, joerg and msvensson

mysys/base64.c:
  Portability change for SCO/HP, compiler don't like
  doing pointer arithmetic on void* variable
include/my_bitmap.h:
  "inline" functions (especially in header files) should be declared "static",
  or else we may get "multiply defined" when they are used in several modules.
  (Solaris compiler problem)
sql/handler.h:
  Compatibility change for AIX compiler
storage/bdb/Makefile.in:
  Added bdb "sequence" directory to "make dist"
cmd-line-utils/readline/complete.c:
  Avoid FreeBSD 5.3 problems including <sys/file.h>
mysql-test/t/disabled.def:
  Disable compress.test for now
storage/bdb/build_unix/.IGNORE_ME:
  File that is copied to prevent empty directories in source TAR
This commit is contained in:
unknown 2005-11-06 02:19:51 +01:00
commit dbfe5a961f
7 changed files with 15 additions and 10 deletions

View file

@ -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;
}