--- embedaddon/php/main/php_config.h.in 2012/02/21 23:48:05 1.1 +++ embedaddon/php/main/php_config.h.in 2013/07/22 01:32:11 1.1.1.3 @@ -1,25 +1,5 @@ /* main/php_config.h.in. Generated from configure.in by autoheader. */ -/* Leave this file alone */ -/* - +----------------------------------------------------------------------+ - | Zend Engine | - +----------------------------------------------------------------------+ - | Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Andi Gutmans | - | Zeev Suraski | - +----------------------------------------------------------------------+ -*/ -/* $Id: php_config.h.in,v 1.1 2012/02/21 23:48:05 misho Exp $ */ #if defined(__GNUC__) && __GNUC__ >= 4 # define ZEND_API __attribute__ ((visibility("default"))) @@ -31,7 +11,6 @@ #define ZEND_DLIMPORT - #undef uint #undef ulong @@ -225,9 +204,6 @@ /* Whether to build spl as dynamic module */ #undef COMPILE_DL_SPL -/* Whether to build sqlite as dynamic module */ -#undef COMPILE_DL_SQLITE - /* Whether to build sqlite3 as dynamic module */ #undef COMPILE_DL_SQLITE3 @@ -357,6 +333,9 @@ #undef DBA_QDBM /* */ +#undef DBA_TCADB + +/* */ #undef DBM_INCLUDE_FILE /* */ @@ -405,9 +384,6 @@ /* Define to 1 if you have the `alphasort' function. */ #undef HAVE_ALPHASORT -/* Suhosin-Patch for PHP */ -#undef SUHOSIN_PATCH - /* Whether you have AOLserver */ #undef HAVE_AOLSERVER @@ -602,12 +578,12 @@ */ #undef HAVE_DECL_TZNAME -/* Define to 1 if you have the header file. */ -#undef HAVE_DEFAULT_STORE_H - /* do we have /dev/poll? */ #undef HAVE_DEVPOLL +/* Define if the target system has /dev/arandom device */ +#undef HAVE_DEV_ARANDOM + /* Define if the target system has /dev/urandom device */ #undef HAVE_DEV_URANDOM @@ -647,6 +623,9 @@ /* OpenSSL 0.9.7 or later */ #undef HAVE_DSA_DEFAULT_METHOD +/* Whether to enable DTrace support */ +#undef HAVE_DTRACE + /* embedded MySQL support enabled */ #undef HAVE_EMBEDDED_MYSQLI @@ -774,6 +753,12 @@ #undef HAVE_GD_IMAGESETTILE /* */ +#undef HAVE_GD_IMAGE_CONVOLUTION + +/* */ +#undef HAVE_GD_IMAGE_PIXELATE + +/* */ #undef HAVE_GD_JPG /* */ @@ -792,6 +777,9 @@ #undef HAVE_GD_WBMP /* */ +#undef HAVE_GD_WEBP + +/* */ #undef HAVE_GD_XBM /* */ @@ -923,6 +911,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IEEEFP_H +/* Define to 1 if you have the `if_indextoname' function. */ +#undef HAVE_IF_INDEXTONAME + +/* Define to 1 if you have the `if_nametoindex' function. */ +#undef HAVE_IF_NAMETOINDEX + /* */ #undef HAVE_IMAP @@ -1219,18 +1213,6 @@ /* */ #undef HAVE_MYSQLILIB -/* Define to 1 if you have the `mysql_commit' function. */ -#undef HAVE_MYSQL_COMMIT - -/* Define to 1 if you have the `mysql_next_result' function. */ -#undef HAVE_MYSQL_NEXT_RESULT - -/* Define to 1 if you have the `mysql_sqlstate' function. */ -#undef HAVE_MYSQL_SQLSTATE - -/* Define to 1 if you have the `mysql_stmt_prepare' function. */ -#undef HAVE_MYSQL_STMT_PREPARE - /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP @@ -1246,9 +1228,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_TCP_H -/* */ -#undef HAVE_NET_SNMP - /* Whether utf8_mime2text() has new signature */ #undef HAVE_NEW_MIME2TEXT @@ -1390,6 +1369,9 @@ /* PostgreSQL 7.2.0 or later */ #undef HAVE_PQESCAPE +/* PostgreSQL 9.0 or later */ +#undef HAVE_PQESCAPELITERAL + /* PostgreSQL 8.1.4 or later */ #undef HAVE_PQESCAPE_BYTEA_CONN @@ -1510,12 +1492,18 @@ /* Define to 1 if you have the `rl_completion_matches' function. */ #undef HAVE_RL_COMPLETION_MATCHES +/* */ +#undef HAVE_RL_ON_NEW_LINE + /* Whether you use Roxen */ #undef HAVE_ROXEN /* */ #undef HAVE_SAPDB +/* Whether you have sockaddr_storage.ss_family */ +#undef HAVE_SA_SS_FAMILY + /* Define to 1 if you have the `scandir' function. */ #undef HAVE_SCANDIR @@ -1565,6 +1553,9 @@ #undef HAVE_SHUTDOWN /* */ +#undef HAVE_SHUTDOWN_SNMP_LOGGING + +/* Whether sigaction() is available */ #undef HAVE_SIGACTION /* Define to 1 if you have the header file. */ @@ -1591,9 +1582,6 @@ /* */ #undef HAVE_SNMP -/* */ -#undef HAVE_SNMP_PARSE_OID - /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF @@ -1816,6 +1804,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H +/* FPM use systemd integration */ +#undef HAVE_SYSTEMD + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSTEMD_SD_DAEMON_H + /* */ #undef HAVE_SYSVMSG @@ -1863,12 +1857,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_RESOURCE_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SDT_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKET_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STATFS_H @@ -1985,7 +1985,7 @@ /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ #undef HAVE_UTIME_NULL -/* Wether struct utsname has domainname */ +/* Whether struct utsname has domainname */ #undef HAVE_UTSNAME_DOMAINNAME /* Define to 1 if you have the `vasprintf' function. */ @@ -2069,9 +2069,6 @@ /* */ #undef LINUX -/* */ -#undef MAGIC_QUOTES - /* Whether asctime_r is declared */ #undef MISSING_ASCTIME_R_DECL @@ -2162,6 +2159,9 @@ /* fpm group name */ #undef PHP_FPM_GROUP +/* fpm systemd service type */ +#undef PHP_FPM_SYSTEMD + /* fpm user name */ #undef PHP_FPM_USER @@ -2210,12 +2210,6 @@ /* whether pwrite64 is default */ #undef PHP_PWRITE_64 -/* */ -#undef PHP_SAFE_MODE - -/* */ -#undef PHP_SAFE_MODE_EXEC_DIR - /* Whether the system supports SHA256 salt */ #undef PHP_SHA256_CRYPT @@ -2225,9 +2219,6 @@ /* */ #undef PHP_SIGCHILD -/* Have PDO */ -#undef PHP_SQLITE2_HAVE_PDO - /* Whether the system supports standard DES salt */ #undef PHP_STD_DES_CRYPT @@ -2261,9 +2252,6 @@ /* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR -/* The size of `char *', as computed by sizeof. */ -#undef SIZEOF_CHAR_P - /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT @@ -2297,15 +2285,12 @@ /* */ #undef SOLARIS +/* have sqlite3 with column metadata enabled */ +#undef SQLITE_ENABLE_COLUMN_METADATA + /* have sqlite3 with extension support */ #undef SQLITE_OMIT_LOAD_EXTENSION -/* Size of a pointer */ -#undef SQLITE_PTR_SZ - -/* */ -#undef SQLITE_UTF8 - /* Needed in sqlunix.h for wchar defs */ #undef SS_FBX @@ -2323,6 +2308,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* */ +#undef TCADB_INCLUDE_FILE + /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME @@ -2333,9 +2321,6 @@ #undef TSRM_ST /* */ -#undef UCD_SNMP_HACK - -/* */ #undef UNDEF_THREADS_HACK /* */ @@ -2353,28 +2338,6 @@ /* Define if cross-process locking is required by accept() */ #undef USE_LOCKING -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - /* */ #undef USE_TRANSFER_TABLES @@ -2387,9 +2350,6 @@ /* Define if processor uses big-endian word */ #undef WORDS_BIGENDIAN -/* Include external shared modules configurations */ -#include "ext/php_config.h" - /* Whether sprintf is broken */ #undef ZEND_BROKEN_SPRINTF @@ -2405,8 +2365,8 @@ /* */ #undef ZEND_MM_ALIGNMENT_LOG2 -/* */ -#undef ZEND_MULTIBYTE +/* Use zend signal handling */ +#undef ZEND_SIGNALS /* virtual machine dispatch method */ #undef ZEND_VM_KIND @@ -2414,16 +2374,13 @@ /* */ #undef ZTS -/* Define to 1 if on MINIX. */ -#undef _MINIX +/* Define to 1 if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -2451,6 +2408,7 @@ /* Define to `unsigned long ' if does not define. */ #undef ulong + #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS #ifdef HAVE_STDLIB_H @@ -2530,11 +2488,5 @@ int zend_sprintf(char *buffer, const char *format, ... #endif #endif -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - */ #undef PTHREADS +