diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-06-05 01:15:07 +0200 |
| commit | 20e331961b2ec797ce8a4acd9c0724bb118f20c4 (patch) | |
| tree | f59ef1650029ff1634fb8e8539ee2dd41dcb8872 /strings/strlen.c | |
| parent | c5558be0e3d5fe8be0f5a63551a5215511a265e0 (diff) | |
| parent | 15d18a98e4e2917ac98ffbc807afd09c934dc6fb (diff) | |
| download | mariadb-git-20e331961b2ec797ce8a4acd9c0724bb118f20c4.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/t/func_misc.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
strings/ctype-ujis.c:
Auto merged
Diffstat (limited to 'strings/strlen.c')
| -rw-r--r-- | strings/strlen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/strlen.c b/strings/strlen.c index b3c901739b1..1469dd096ee 100644 --- a/strings/strlen.c +++ b/strings/strlen.c @@ -31,7 +31,7 @@ #if VaxAsm -size_s strlen(char *s) +size_t strlen(char *s) { asm("locc $0,$65535,*4(ap)"); asm("subl3 r0,$65535,r0"); @@ -40,7 +40,7 @@ size_s strlen(char *s) #else #if defined(MC68000) && defined(DS90) -size_s strlen(char *s) +size_t strlen(char *s) { asm(" movl 4(a7),a0 "); asm(" movl a0,a1 "); @@ -52,13 +52,13 @@ asm(" subql #1,d0 "); } #else -size_s strlen(register char *s) +size_t strlen(register char *s) { register char *startpos; startpos = s; while (*s++); - return ((size_s) (s-startpos-1)); + return ((size_t) (s-startpos-1)); } #endif |