diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-02-02 16:22:43 +0100 |
| commit | b6284c07d03a04d737467c0bba1dc268be85c9e1 (patch) | |
| tree | 7bb7d6362aec024912ce83d0717d656ffad3db66 /main/php.h | |
| parent | 047c0f130629403041f97af7705453f5ff33df9f (diff) | |
| download | php-b6284c07d03a04d737467c0bba1dc268be85c9e1.tar.gz | |
Imported Upstream version 5.4.0~rc6
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/main/php.h b/main/php.h index 9e84459af..577be30fc 100644 --- a/main/php.h +++ b/main/php.h @@ -26,7 +26,7 @@ #include <dmalloc.h> #endif -#define PHP_API_VERSION 20090626 +#define PHP_API_VERSION 20100412 #define PHP_HAVE_STREAMS #define YYDEBUG 0 @@ -147,7 +147,11 @@ END_EXTERN_C() #endif #ifndef HAVE_SOCKLEN_T +# if PHP_WIN32 +typedef int socklen_t; +# else typedef unsigned int socklen_t; +# endif #endif #define CREATE_MUTEX(a, b) @@ -182,7 +186,6 @@ typedef unsigned int socklen_t; #endif #include "zend_hash.h" -#include "php3_compat.h" #include "zend_alloc.h" #include "zend_stack.h" @@ -197,8 +200,6 @@ typedef unsigned int socklen_t; # endif #endif -#include "safe_mode.h" - #ifndef HAVE_STRERROR char *strerror(int); #endif @@ -258,6 +259,11 @@ END_EXTERN_C() # endif #endif +#if defined(__GNUC__) && __GNUC__ >= 4 +# define php_ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; })) +#else +# define php_ignore_value(x) ((void) (x)) +#endif /* global variables */ #if !defined(PHP_WIN32) @@ -279,6 +285,7 @@ void phperror(char *error); PHPAPI int php_write(void *buf, uint size TSRMLS_DC); PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2); +PHPAPI int php_get_module_initialized(void); PHPAPI void php_log_err(char *log_message TSRMLS_DC); int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2); int cfgparse(void); @@ -332,6 +339,7 @@ PHPAPI int php_register_internal_extensions(TSRMLS_D); PHPAPI int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC); PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata); PHPAPI void php_com_initialize(TSRMLS_D); +PHPAPI char *php_get_current_user(TSRMLS_D); END_EXTERN_C() /* PHP-named Zend macro wrappers */ @@ -387,20 +395,7 @@ END_EXTERN_C() /* Output support */ #include "main/php_output.h" -#define PHPWRITE(str, str_len) php_body_write((str), (str_len) TSRMLS_CC) -#define PUTS(str) do { \ - const char *__str = (str); \ - php_body_write(__str, strlen(__str) TSRMLS_CC); \ -} while (0) - -#define PUTC(c) (php_body_write(&(c), 1 TSRMLS_CC), (c)) -#define PHPWRITE_H(str, str_len) php_header_write((str), (str_len) TSRMLS_CC) -#define PUTS_H(str) do { \ - const char *__str = (str); \ - php_header_write(__str, strlen(__str) TSRMLS_CC); \ -} while (0) - -#define PUTC_H(c) (php_header_write(&(c), 1 TSRMLS_CC), (c)) + #include "php_streams.h" #include "php_memory_streams.h" |