cvs commit

From: sas Date: Sat Jul 3 05:49:24 1999 Modified files: php3/acconfig.h php3/config.h.in php3/configure.in php3/php.h Log message: some clean ups - reenable HAVE_SNPRINTF standard behaviour - *DO NOT* change config.h.in manually. change acconfig.h and run autoheader Index: php3/acconfig.h diff -u php3/acconfig.h:1.102 php3/acconfig.h:1.103 --- php3/acconfig.h:1.102 Tue Jun 22 22:45:50 1999 +++ php3/acconfig.h Sat Jul 3 05:49:23 1999 @@ -1,3 +1,7 @@ +#undef HAVE_LIBGD14 +#undef HAVE_LIBGD15 +#undef HAVE_LIBGD_LZW +#undef ushort #undef UCD_SNMP_HACK Index: php3/config.h.in diff -u php3/config.h.in:1.179 php3/config.h.in:1.180 --- php3/config.h.in:1.179 Sat Jul 3 01:40:20 1999 +++ php3/config.h.in Sat Jul 3 05:49:23 1999 @@ -68,6 +68,11 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +#undef HAVE_LIBGD14 +#undef HAVE_LIBGD15 +#undef HAVE_LIBGD_LZW +#undef ushort + #undef UCD_SNMP_HACK /* Define if you want dmalloc checking */ @@ -113,9 +118,6 @@ /* define uint by configure if it is missed (QNX and BSD derived) */ #undef uint -/* define ushort by configure if it is missed (OS/2) */ -#undef ushort - /* define ulong by configure if it is missed (most probably is) */ #undef ulong @@ -154,15 +156,6 @@ /* Define if you have the zlib library */ #define HAVE_ZLIB 0 - -/* Define if you have the gd version 1.5 library with the LZW option. */ -#define HAVE_LIBGD_LZW 0 - -/* Define if you have the gd version 1.5 library (-lgd). */ -#define HAVE_LIBGD15 0 - -/* Define if you have the gd version 1.4 library (-lgd). */ -#define HAVE_LIBGD14 0 /* Define if you have the gd version 1.3 library (-lgd). */ #define HAVE_LIBGD13 0 Index: php3/configure.in diff -u php3/configure.in:1.428 php3/configure.in:1.429 --- php3/configure.in:1.428 Sat Jul 3 01:40:20 1999 +++ php3/configure.in Sat Jul 3 05:49:23 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.428 1999/07/03 05:40:20 bjh Exp $ +dnl $Id: configure.in,v 1.429 1999/07/03 09:49:23 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -245,8 +245,7 @@ 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 gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton shutdown truncate getpgid getsid getrlimit) -AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,)) +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 gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton shutdown truncate getpgid getsid getrlimit snprintf) AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA AC_BROKEN_SPRINTF Index: php3/php.h diff -u php3/php.h:1.59 php3/php.h:1.60 --- php3/php.h:1.59 Sat Jul 3 01:40:20 1999 +++ php3/php.h Sat Jul 3 05:49:23 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.59 1999/07/03 05:40:20 bjh Exp $ */ +/* $Id: php.h,v 1.60 1999/07/03 09:49:23 sas Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -216,7 +216,15 @@ #if APACHE /* apache httpd */ # if HAVE_AP_CONFIG_H +#include "ap_config_auto.h" +#ifdef RHAPSODY +#undef HAVE_SNPRINTF +#endif #include "ap_config.h" +#ifdef RHAPSODY +#undef HAVE_SNPRINTF +#define HAVE_SNPRINTF 1 +#endif # endif # if HAVE_OLD_COMPAT_H #include "compat.h"