diff options
| author | Stig Bakken <ssb@php.net> | 1999-09-15 09:35:20 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 1999-09-15 09:35:20 +0000 |
| commit | 1740e6ee4ef01c2130db756a17fe8d8665438231 (patch) | |
| tree | f51ba619125a2375f705db0aa25691958e3d31d3 | |
| parent | 36101a55ade279df49aed987da6f77b6de5476da (diff) | |
| download | php-git-1740e6ee4ef01c2130db756a17fe8d8665438231.tar.gz | |
Clean up the strlcat/strlcpy checks.
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | configure.in.in | 3 | ||||
| -rw-r--r-- | main/php.h | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 0240d5e3f5..c0eaf0f439 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,12 +72,8 @@ EXT_SHARED = @EXT_SHARED@ SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \ configuration-parser.c configuration-scanner.c request_info.c \ safe_mode.c fopen-wrappers.c php3_realpath.c alloca.c output.c \ - php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c strlcpy.c strlcat.c -OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \ - configuration-parser.o configuration-scanner.o request_info.o \ - safe_mode.o fopen-wrappers.o php3_realpath.o alloca.o output.o \ - php_ini.o SAPI.o cgi_main.o rfc1867.o dlist.o strlcpy.o strlcat.o - + php_ini.c SAPI.c cgi_main.c rfc1867.c dlist.c +OBJS = $(SOURCE:.c=.o) PHPLIBS = -Llibzend -lzend -Lext -lphpext LIBS = $(PHPLIBS) $(EXTRA_LIBS) @LIBS@ diff --git a/configure.in.in b/configure.in.in index 95f456d78d..7fc9613eb1 100644 --- a/configure.in.in +++ b/configure.in.in @@ -314,7 +314,8 @@ AC_CHECK_TYPE( ulong, unsigned long ) dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt rint setitimer unsetenv strftime setsockopt tzset shutdown inet_aton statvfs statfs mmap strlcat strlcpy) +AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt rint setitimer unsetenv strftime setsockopt tzset shutdown inet_aton statvfs statfs mmap) +AC_REPLACE_FUNCS(strlcat strlcpy) AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA dnl## OLDLIBS=$LIBS; LIBS="" diff --git a/main/php.h b/main/php.h index 7b87116fc5..4f635a21e8 100644 --- a/main/php.h +++ b/main/php.h @@ -95,11 +95,11 @@ extern unsigned char second_arg_allow_ref[]; #include <alloca.h> #endif -#if !HAVE_STRLCPY +#ifndef HAVE_STRLCPY size_t strlcpy(char *dst, const char *src, size_t siz); #endif -#if !HAVE_STRLCAT +#ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz); #endif |