summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
Diffstat (limited to 'win32')
-rw-r--r--win32/build/config.w326
-rw-r--r--win32/globals.c4
-rw-r--r--win32/php_registry.h2
-rw-r--r--win32/php_win32_globals.h6
-rw-r--r--win32/readdir.c1
-rw-r--r--win32/registry.c2
-rw-r--r--win32/sendmail.c24
-rw-r--r--win32/sendmail.h6
-rw-r--r--win32/wsyslog.c3
9 files changed, 28 insertions, 26 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 574d8e274b..6b06cfead0 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -132,6 +132,8 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \
zend_inheritance.c");
+ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+
/* XXX inspect this for other toolsets */
if (VS_TOOLSET && VCVERS == 1200) {
AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
@@ -141,6 +143,7 @@ ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \
php_open_temporary_file.c output.c internal_functions.c php_sprintf.c");
+ADD_FLAG("CFLAGS_BD_MAIN", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");
// Newer versions have it
@@ -153,10 +156,13 @@ if (VS_TOOLSET && VCVERS >= 1400 || !VS_TOOLSET) {
ADD_SOURCES("main/streams", "streams.c cast.c memory.c filter.c plain_wrapper.c \
userspace.c transports.c xp_socket.c mmap.c glob_wrapper.c");
+ADD_FLAG("CFLAGS_BD_MAIN_STREAMS", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
ADD_SOURCES("win32", "glob.c readdir.c \
registry.c select.c sendmail.c time.c winutil.c wsyslog.c globals.c");
+ADD_FLAG("CFLAGS_BD_WIN32", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+
PHP_INSTALL_HEADERS("", "Zend/ TSRM/ main/ main/streams/ win32/");
STDOUT.WriteBlankLines(1);
diff --git a/win32/globals.c b/win32/globals.c
index ec4180db38..8eff286995 100644
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -28,13 +28,13 @@ PHPAPI int php_win32_core_globals_id;
php_win32_core_globals the_php_win32_core_globals;
#endif
-void php_win32_core_globals_ctor(void *vg TSRMLS_DC)
+void php_win32_core_globals_ctor(void *vg)
{
php_win32_core_globals *wg = (php_win32_core_globals*)vg;
memset(wg, 0, sizeof(*wg));
}
-void php_win32_core_globals_dtor(void *vg TSRMLS_DC)
+void php_win32_core_globals_dtor(void *vg)
{
php_win32_core_globals *wg = (php_win32_core_globals*)vg;
diff --git a/win32/php_registry.h b/win32/php_registry.h
index 2b111dbb8b..bce2fe0978 100644
--- a/win32/php_registry.h
+++ b/win32/php_registry.h
@@ -2,7 +2,7 @@
#define PHP_REGISTRY_H
-void UpdateIniFromRegistry(char *path TSRMLS_DC);
+void UpdateIniFromRegistry(char *path);
char *GetIniPathFromRegistry();
#endif /* PHP_REGISTRY_H */
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index 42f5ec9411..4341a99959 100644
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h
@@ -26,7 +26,7 @@
typedef struct _php_win32_core_globals php_win32_core_globals;
#ifdef ZTS
-# define PW32G(v) TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v)
+# define PW32G(v) ZEND_TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v)
extern PHPAPI int php_win32_core_globals_id;
#else
# define PW32G(v) (the_php_win32_core_globals.v)
@@ -43,8 +43,8 @@ struct _php_win32_core_globals {
HashTable *registry_directories;
};
-void php_win32_core_globals_ctor(void *vg TSRMLS_DC);
-void php_win32_core_globals_dtor(void *vg TSRMLS_DC);
+void php_win32_core_globals_ctor(void *vg);
+void php_win32_core_globals_dtor(void *vg);
PHP_RSHUTDOWN_FUNCTION(win32_core_globals);
#endif
diff --git a/win32/readdir.c b/win32/readdir.c
index 4e5992167c..15e145bafa 100644
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -26,7 +26,6 @@ DIR *opendir(const char *dir)
HANDLE handle;
int index;
char resolved_path_buff[MAXPATHLEN];
- TSRMLS_FETCH();
if (!VCWD_REALPATH(dir, resolved_path_buff)) {
return NULL;
diff --git a/win32/registry.c b/win32/registry.c
index ef36c14555..da21c7d942 100644
--- a/win32/registry.c
+++ b/win32/registry.c
@@ -155,7 +155,7 @@ static void delete_internal_hashtable(zval *zv)
#define RegNotifyFlags (REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_ATTRIBUTES | REG_NOTIFY_CHANGE_LAST_SET)
-void UpdateIniFromRegistry(char *path TSRMLS_DC)
+void UpdateIniFromRegistry(char *path)
{
char *p, *orig_path;
int path_len;
diff --git a/win32/sendmail.c b/win32/sendmail.c
index a88323722d..db31d7d0e4 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -151,7 +151,7 @@ static char *ErrorMessages[] =
* Returns NULL on error, or the new char* buffer on success.
* You have to take care and efree() the buffer on your own.
*/
-static zend_string *php_win32_mail_trim_header(char *header TSRMLS_DC)
+static zend_string *php_win32_mail_trim_header(char *header)
{
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
@@ -167,14 +167,14 @@ static zend_string *php_win32_mail_trim_header(char *header TSRMLS_DC)
ZVAL_STRINGL(&replace, PHP_WIN32_MAIL_UNIFY_REPLACE, strlen(PHP_WIN32_MAIL_UNIFY_REPLACE));
regex = zend_string_init(PHP_WIN32_MAIL_UNIFY_REPLACE, sizeof(PHP_WIN32_MAIL_UNIFY_REPLACE)-1, 0);
-//zend_string *php_pcre_replace(zend_string *regex, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count TSRMLS_DC);
+//zend_string *php_pcre_replace(zend_string *regex, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count);
result = php_pcre_replace(regex,
header, (int)strlen(header),
&replace,
0,
-1,
- NULL TSRMLS_CC);
+ NULL);
if (NULL == result) {
zval_ptr_dtor(&replace);
@@ -190,7 +190,7 @@ static zend_string *php_win32_mail_trim_header(char *header TSRMLS_DC)
&replace,
0,
-1,
- NULL TSRMLS_CC);
+ NULL);
return result;
#else
/* In case we don't have PCRE support (for whatever reason...) simply do nothing and return the unmodified header */
@@ -213,7 +213,7 @@ static zend_string *php_win32_mail_trim_header(char *header TSRMLS_DC)
//********************************************************************/
PHPAPI int TSendMail(char *host, int *error, char **error_message,
char *headers, char *Subject, char *mailTo, char *data,
- char *mailCc, char *mailBcc, char *mailRPath TSRMLS_DC)
+ char *mailCc, char *mailBcc, char *mailRPath)
{
int ret;
char *RPath = NULL;
@@ -240,7 +240,7 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
zend_string *headers_trim;
/* Use PCRE to trim the header into the right format */
- if (NULL == (headers_trim = php_win32_mail_trim_header(headers TSRMLS_CC))) {
+ if (NULL == (headers_trim = php_win32_mail_trim_header(headers))) {
*error = W32_SM_PCRE_ERROR;
return FAILURE;
}
@@ -302,7 +302,7 @@ PHPAPI int TSendMail(char *host, int *error, char **error_message,
MailHost, !INI_INT("smtp_port") ? 25 : INI_INT("smtp_port"));
return FAILURE;
} else {
- ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data, headers, headers_lc->val, error_message TSRMLS_CC);
+ ret = SendText(RPath, Subject, mailTo, mailCc, mailBcc, data, headers, headers_lc->val, error_message);
TSMClose();
if (RPath) {
efree(RPath);
@@ -383,7 +383,7 @@ PHPAPI zend_string *php_str_to_str(char *haystack, size_t length, char *needle,
// History:
//*******************************************************************/
static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailBcc, char *data,
- char *headers, char *headers_lc, char **error_message TSRMLS_DC)
+ char *headers, char *headers_lc, char **error_message)
{
int res;
char *p;
@@ -608,9 +608,9 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
/* send message header */
if (Subject == NULL) {
- res = PostHeader(RPath, "No Subject", mailTo, stripped_header TSRMLS_CC);
+ res = PostHeader(RPath, "No Subject", mailTo, stripped_header);
} else {
- res = PostHeader(RPath, Subject, mailTo, stripped_header TSRMLS_CC);
+ res = PostHeader(RPath, Subject, mailTo, stripped_header);
}
if (stripped_header) {
efree(stripped_header);
@@ -683,7 +683,7 @@ static int addToHeader(char **header_buffer, const char *specifier, char *string
// Author/Date: jcar 20/9/96
// History:
//********************************************************************/
-static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders TSRMLS_DC)
+static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders)
{
/* Print message header according to RFC 822 */
/* Return-path, Received, Date, From, Subject, Sender, To, cc */
@@ -706,7 +706,7 @@ static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders T
if (!xheaders || !strstr(headers_lc, "date:")) {
time_t tNow = time(NULL);
- zend_string *dt = php_format_date("r", 1, tNow, 1 TSRMLS_CC);
+ zend_string *dt = php_format_date("r", 1, tNow, 1);
snprintf(header_buffer, MAIL_BUFFER_SIZE, "Date: %s\r\n", dt->val);
zend_string_free(dt);
diff --git a/win32/sendmail.h b/win32/sendmail.h
index 6fed77ea06..77d909ab1f 100644
--- a/win32/sendmail.h
+++ b/win32/sendmail.h
@@ -36,14 +36,14 @@
PHPAPI int TSendMail(char *smtpaddr, int *returnerror, char **error_message,
char *RPath, char *Subject, char *mailTo, char *data,
- char *mailCc, char *mailBcc, char *mailRPath TSRMLS_DC);
+ char *mailCc, char *mailBcc, char *mailRPath);
PHPAPI void TSMClose(void);
static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char *mailBcc, char *data,
- char *headers, char *headers_lc, char **error_message TSRMLS_DC);
+ char *headers, char *headers_lc, char **error_message);
PHPAPI char *GetSMErrorText(int index);
static int MailConnect();
-static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders TSRMLS_DC);
+static int PostHeader(char *RPath, char *Subject, char *mailTo, char *xheaders);
static int Post(LPCSTR msg);
static int Ack(char **server_response);
static unsigned long GetAddr(LPSTR szHost);
diff --git a/win32/wsyslog.c b/win32/wsyslog.c
index 75c5ef58e5..ff0293fd9d 100644
--- a/win32/wsyslog.c
+++ b/win32/wsyslog.c
@@ -61,7 +61,6 @@
void closelog(void)
{
- TSRMLS_FETCH();
if (PW32G(log_source)) {
DeregisterEventSource(PW32G(log_source));
PW32G(log_source) = NULL;
@@ -85,7 +84,6 @@ void syslog(int priority, const char *message, ...)
unsigned short etype;
char *tmp = NULL;
DWORD evid;
- TSRMLS_FETCH();
/* default event source */
if (!PW32G(log_source))
@@ -123,7 +121,6 @@ void syslog(int priority, const char *message, ...)
void openlog(const char *ident, int logopt, int facility)
{
- TSRMLS_FETCH();
if (PW32G(log_source)) {
closelog();
View Lorry Controller Status