summaryrefslogtreecommitdiff
path: root/strings/strlen.c
diff options
context:
space:
mode:
Diffstat (limited to 'strings/strlen.c')
-rw-r--r--strings/strlen.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/strings/strlen.c b/strings/strlen.c
index b3c901739b1..3dc514d631d 100644
--- a/strings/strlen.c
+++ b/strings/strlen.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2006, 2007 MySQL AB
+ Use is subject to license terms.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,7 +12,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
/* File : strlen.c
Author : Richard A. O'Keefe. / Monty
@@ -31,7 +33,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 +42,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 +54,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