--- embedaddon/php/main/php.h	2012/02/21 23:48:05	1.1.1.1
+++ embedaddon/php/main/php.h	2012/05/29 12:34:35	1.1.1.2
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php.h,v 1.1.1.1 2012/02/21 23:48:05 misho Exp $ */
+/* $Id: php.h,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */
 
 #ifndef PHP_H
 #define 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
 
@@ -61,14 +61,10 @@
 #		define PHPAPI
 #	endif
 
-#define THREAD_LS
-#define PHP_DIR_SEPARATOR '/'
-#if defined(__MacOSX__)
-#define PHP_EOL "\r"
-#else 
-#define PHP_EOL "\n"
+#	define THREAD_LS
+#	define PHP_DIR_SEPARATOR '/'
+#	define PHP_EOL "\n"
 #endif
-#endif
 
 #ifdef NETWARE
 /* For php_get_uname() function */
@@ -147,7 +143,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 +182,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 +196,6 @@ typedef unsigned int socklen_t;
 # endif
 #endif
 
-#include "safe_mode.h"
-
 #ifndef HAVE_STRERROR
 char *strerror(int);
 #endif
@@ -258,6 +255,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 +281,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 +335,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,21 +391,8 @@ 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"
 #include "fopen_wrappers.h"
@@ -453,10 +444,6 @@ END_EXTERN_C()
 #define XtOffsetOf(s_type, field) XtOffset(s_type*, field)
 #endif
 #endif /* !XtOffsetOf */
-
-#if SUHOSIN_PATCH
-#include "suhosin_patch.h"
-#endif
 
 #endif