embedaddon/php/Zend/zend_globals.h - diff

Return to zend_globals.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_globals.h between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:47:52	version 1.1.1.4, 2013/10/14 08:02:48
Line 2	Line 2
+----------------------------------------------------------------------+	+----------------------------------------------------------------------+
\| Zend Engine \|	\| Zend Engine \|
+----------------------------------------------------------------------+	+----------------------------------------------------------------------+
\| Copyright (c) 1998-2012 Zend Technologies Ltd. (http://www.zend.com) \|	\| Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) \|
+----------------------------------------------------------------------+	+----------------------------------------------------------------------+
\| This source file is subject to version 2.00 of the Zend license, \|	\| 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 \|	\| that is bundled with this package in the file LICENSE, and is \|
Line 34	Line 34
#include "zend_objects.h"	#include "zend_objects.h"
#include "zend_objects_API.h"	#include "zend_objects_API.h"
#include "zend_modules.h"	#include "zend_modules.h"
	#include "zend_float.h"
#ifdef ZEND_MULTIBYTE
#include "zend_multibyte.h"	#include "zend_multibyte.h"
#endif /* ZEND_MULTIBYTE */

/* Define ZTS if you want a thread-safe Zend */	/* Define ZTS if you want a thread-safe Zend */
/#undef ZTS/	/#undef ZTS/
Line 68 typedef struct _zend_declarables {	Line 66 typedef struct _zend_declarables {
} zend_declarables;	} zend_declarables;

typedef struct _zend_vm_stack *zend_vm_stack;	typedef struct _zend_vm_stack *zend_vm_stack;
	typedef struct _zend_ini_entry zend_ini_entry;


struct _zend_compiler_globals {	struct _zend_compiler_globals {
zend_stack bp_stack;	zend_stack bp_stack;
zend_stack switch_cond_stack;	zend_stack switch_cond_stack;
Line 101 struct _zend_compiler_globals {	Line 101 struct _zend_compiler_globals {

HashTable *auto_globals;	HashTable *auto_globals;

	zend_bool parse_error;
zend_bool in_compilation;	zend_bool in_compilation;
zend_bool short_tags;	zend_bool short_tags;
zend_bool asp_tags;	zend_bool asp_tags;
zend_bool allow_call_time_pass_reference;

zend_declarables declarables;	zend_declarables declarables;

Line 137 struct _zend_compiler_globals {	Line 137 struct _zend_compiler_globals {
zend_bool in_namespace;	zend_bool in_namespace;
zend_bool has_bracketed_namespaces;	zend_bool has_bracketed_namespaces;

HashTable *labels;	zend_compiler_context context;
zend_stack labels_stack;	zend_stack context_stack;

#ifdef ZEND_MULTIBYTE	/* interned strings */
zend_encoding **script_encoding_list;	char *interned_strings_start;
	char *interned_strings_end;
	char *interned_strings_top;
	char *interned_strings_snapshot_top;

	HashTable interned_strings;

	const zend_encoding **script_encoding_list;
size_t script_encoding_list_size;	size_t script_encoding_list_size;
	zend_bool multibyte;
zend_bool detect_unicode;	zend_bool detect_unicode;
zend_bool encoding_declared;	zend_bool encoding_declared;

zend_encoding *internal_encoding;

/* multibyte utility functions */
zend_encoding_detector encoding_detector;
zend_encoding_converter encoding_converter;
zend_encoding_oddlen encoding_oddlen;
#endif /* ZEND_MULTIBYTE */

#ifdef ZTS	#ifdef ZTS
HashTable **static_members;	zval ***static_members_table;
int last_static_member;	int last_static_member;
#endif	#endif
};	};
Line 240 struct _zend_executor_globals {	Line 240 struct _zend_executor_globals {

HashTable *ini_directives;	HashTable *ini_directives;
HashTable *modified_ini_directives;	HashTable *modified_ini_directives;
	zend_ini_entry *error_reporting_ini_entry;

zend_objects_store objects_store;	zend_objects_store objects_store;
zval exception, prev_exception;	zval exception, prev_exception;
Line 254 struct _zend_executor_globals {	Line 255 struct _zend_executor_globals {

zend_bool active;	zend_bool active;

void *saved_fpu_cw;	zend_op *start_op;

	void *saved_fpu_cw_ptr;
	#if XPFPA_HAVE_CW
	XPFPA_CW_DATATYPE saved_fpu_cw;
	#endif

void *reserved[ZEND_MAX_RESERVED_RESOURCES];	void *reserved[ZEND_MAX_RESERVED_RESOURCES];
};	};

Line 292 struct _zend_php_scanner_globals {	Line 298 struct _zend_php_scanner_globals {
int yy_state;	int yy_state;
zend_stack state_stack;	zend_stack state_stack;

#ifdef ZEND_MULTIBYTE
/* original (unfiltered) script */	/* original (unfiltered) script */
unsigned char *script_org;	unsigned char *script_org;
size_t script_org_size;	size_t script_org_size;
Line 301 struct _zend_php_scanner_globals {	Line 306 struct _zend_php_scanner_globals {
unsigned char *script_filtered;	unsigned char *script_filtered;
size_t script_filtered_size;	size_t script_filtered_size;

/* input/ouput filters */	/* input/output filters */
zend_encoding_filter input_filter;	zend_encoding_filter input_filter;
zend_encoding_filter output_filter;	zend_encoding_filter output_filter;
zend_encoding *script_encoding;	const zend_encoding *script_encoding;
zend_encoding *internal_encoding;
#endif /* ZEND_MULTIBYTE */
};	};

#endif /* ZEND_GLOBALS_H */	#endif /* ZEND_GLOBALS_H */

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.4