diff options
author | unknown <knielsen@mysql.com> | 2006-05-02 09:19:54 +0200 |
---|---|---|
committer | unknown <knielsen@mysql.com> | 2006-05-02 09:19:54 +0200 |
commit | 33417297c5e11ff82aae7bc2d8b5a75968725905 (patch) | |
tree | 344e142a1552ff36726a9f213f672836202a643a /mysys | |
parent | a82956545761a68c87d235ba4b0bea9729cebab7 (diff) | |
download | mariadb-git-33417297c5e11ff82aae7bc2d8b5a75968725905.tar.gz |
Fix a bunch of non-Linux compile failures.
VC++Files/mysql.sln:
mysql_client_test depends on mysys.
VC++Files/mysys/mysys.vcproj:
Add new file missing in previous push.
mysys/my_memmem.c:
Fix illegal pointer arithmetics on void *.
tests/Makefile.am:
-L must go before -l
tests/mysql_client_test.c:
No declarations after statement in C code.
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_memmem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_memmem.c b/mysys/my_memmem.c index 3a71d39c262..682a1314f09 100644 --- a/mysys/my_memmem.c +++ b/mysys/my_memmem.c @@ -9,8 +9,9 @@ void *my_memmem(const void *haystack, size_t haystacklen, const void *needle, size_t needlelen) { - const void *cursor; - const void *last_possible_needle_location = haystack + haystacklen - needlelen; + const unsigned char *cursor; + const unsigned char *last_possible_needle_location = + (unsigned char *)haystack + haystacklen - needlelen; /* Easy answers */ if (needlelen > haystacklen) return(NULL); |