about summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
Diffstat (limited to 'string')
-rw-r--r--string/Makefile2
-rw-r--r--string/Versions3
-rw-r--r--string/string.h13
3 files changed, 15 insertions, 3 deletions
diff --git a/string/Makefile b/string/Makefile
index 9de1111f55..ca823f42dc 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -31,7 +31,7 @@ routines	:= strcat strchr strcmp strcoll strcpy strcspn		\
 		   strncat strncmp strncpy				\
 		   strrchr strpbrk strsignal strspn strstr strtok	\
 		   strtok_r strxfrm memchr memcmp memmove memset	\
-		   mempcpy bcopy bzero ffs stpcpy stpncpy		\
+		   mempcpy bcopy bzero ffs ffsll stpcpy stpncpy		\
 		   strcasecmp strncase strcasecmp_l strncase_l		\
 		   memccpy memcpy wordcopy strsep strcasestr		\
 		   swab strfry memfrob memmem				\
diff --git a/string/Versions b/string/Versions
index 977413902d..32d0123e40 100644
--- a/string/Versions
+++ b/string/Versions
@@ -44,6 +44,9 @@ libc {
     # functions used in other libraries
     __strcasestr;
 
+    # f*
+    ffsl; ffsll;
+
     # m*
     mempcpy;
 
diff --git a/string/string.h b/string/string.h
index 409fa99283..8f863b887c 100644
--- a/string/string.h
+++ b/string/string.h
@@ -234,8 +234,17 @@ extern char *rindex __P ((__const char *__s, int __c));
 
 /* Return the position of the first bit set in I, or 0 if none are set.
    The least-significant bit is position 1, the most-significant 32.  */
-extern int __ffs __P ((int __i));
-extern int ffs __P ((int __i));
+extern int __ffs __P ((int __i)) __attribute__ ((const));
+extern int ffs __P ((int __i)) __attribute__ ((const));
+
+/* The following two functions are non-standard but necessary for non-32 bit
+   platforms.  */
+# ifdef	__USE_GNU
+extern int ffsl __P ((long int __l)) __attribute__ ((const));
+#  ifdef __GNUC__
+extern int ffsll __P ((long long int __ll)) __attribute__ ((const));
+#  endif
+# endif
 
 /* Compare S1 and S2, ignoring case.  */
 extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));