diff options
| author | Pierre Joye <pajoye@php.net> | 2009-12-09 00:32:14 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-12-09 00:32:14 +0000 |
| commit | 2e6c08b28982cfe72642f2f93cb2345548c1a1b2 (patch) | |
| tree | e1d7707489cc2ebbba91bc78281ba48de9dbaa52 | |
| parent | 9001b4036a62587a923731b4d78c0b6d8083fd1b (diff) | |
| download | php-git-2e6c08b28982cfe72642f2f93cb2345548c1a1b2.tar.gz | |
- drop non used code and fix warning
| -rw-r--r-- | ext/standard/crypt_sha512.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c index 7bc648d7fa..065721a5ef 100644 --- a/ext/standard/crypt_sha512.c +++ b/ext/standard/crypt_sha512.c @@ -39,24 +39,13 @@ # include <strings.h> # endif #endif -#if 0 -#ifndef stpncpy -char * stpncpy(char *dst, const char *src, size_t len) -{ - size_t n = strlen(src); - if (n > len) { - n = len; - } - return strncpy(dst, src, len) + n; -} -#endif -#ifndef mempcpy -void * mempcpy(void * dst, const void * src, size_t len) -{ - return (((char *)memcpy(dst, src, len)) + len); -} +#ifndef HAVE_MEMPCPY +extern void * mempcpy(void * dst, const void * src, size_t len); #endif + +#ifndef HAVE_STRPNCPY +extern char * stpncpy(char *dst, const char *src, size_t len); #endif #ifndef MIN |