From 855a09f4eded707941180c9d90acd17c25e29447 Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Tue, 9 Mar 2010 11:57:54 +0100 Subject: Imported Upstream version 5.3.2 --- main/php.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'main/php.h') diff --git a/main/php.h b/main/php.h index 6655f3cb3..08cf29361 100644 --- a/main/php.h +++ b/main/php.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2009 The PHP Group | + | Copyright (c) 1997-2010 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h 282827 2009-06-26 15:44:19Z johannes $ */ +/* $Id: php.h 294524 2010-02-04 10:13:54Z pajoye $ */ #ifndef PHP_H #define PHP_H @@ -309,6 +309,9 @@ PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5); PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6); +#ifdef PHP_WIN32 +PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); +#endif END_EXTERN_C() #define php_error_docref php_error_docref0 -- cgit v1.2.3