From aa339d00d87b7476f4b2d8140ec58e9e94969a4b Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 20 Sep 2014 22:12:28 +0200 Subject: enable native TLS by default on Windows --- win32/build/config.w32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 82378b536d..a9474642ea 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -221,7 +221,7 @@ if (PHP_DEBUG == "yes") { } if (PHP_ZTS == "yes") { - ADD_FLAG("CFLAGS", "/D ZTS=1"); + ADD_FLAG("CFLAGS", "/D ZTS=1 /D USE___THREAD=1"); ADD_FLAG("ZTS", "1"); } else { ADD_FLAG("ZTS", "0"); -- cgit v1.2.1 From f2e636de051f2891a492d3ceaabc3afd6f930c7f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 22 Sep 2014 10:26:49 +0200 Subject: pickup the alignment definition --- win32/build/config.w32 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/build/config.w32 b/win32/build/config.w32 index a9474642ea..a7b525075d 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -221,7 +221,8 @@ if (PHP_DEBUG == "yes") { } if (PHP_ZTS == "yes") { - ADD_FLAG("CFLAGS", "/D ZTS=1 /D USE___THREAD=1"); + var tsrm_align = X64 ? 8 : 4; + ADD_FLAG("CFLAGS", "/D ZTS=1 /D USE___THREAD=1 /D TSRM_MM_ALIGNMENT=" + tsrm_align); ADD_FLAG("ZTS", "1"); } else { ADD_FLAG("ZTS", "0"); -- cgit v1.2.1 From 4db75dc8533a69e8849651ab5d0fa84efa3d8bba Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 22 Sep 2014 20:58:45 +0200 Subject: basic windows fix --- win32/globals.c | 2 +- win32/php_win32_globals.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/globals.c b/win32/globals.c index ec4180db38..47f4ebacce 100644 --- a/win32/globals.c +++ b/win32/globals.c @@ -23,7 +23,7 @@ #include "syslog.h" #ifdef ZTS -PHPAPI int php_win32_core_globals_id; +TSRMG_D(php_win32_core_globals, php_win32_core_globals_id); #else php_win32_core_globals the_php_win32_core_globals; #endif diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9411..ae975dcb31 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -27,7 +27,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) -extern PHPAPI int php_win32_core_globals_id; +TSRMG_DH(php_win32_core_globals, php_win32_core_globals_id); #else # define PW32G(v) (the_php_win32_core_globals.v) extern PHPAPI struct _php_win32_core_globals the_php_win32_core_globals; -- cgit v1.2.1 From d11734b4b00f57de80d931ad1c522e00082443af Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 25 Sep 2014 18:48:27 +0200 Subject: reworked the patch, less new stuff but worky TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations. --- win32/build/config.w32 | 3 +-- win32/globals.c | 2 +- win32/php_win32_globals.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'win32') diff --git a/win32/build/config.w32 b/win32/build/config.w32 index f0689c2792..5806343518 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -221,8 +221,7 @@ if (PHP_DEBUG == "yes") { } if (PHP_ZTS == "yes") { - var tsrm_align = X64 ? 8 : 4; - ADD_FLAG("CFLAGS", "/D ZTS=1 /D USE___THREAD=1 /D TSRM_MM_ALIGNMENT=" + tsrm_align); + ADD_FLAG("CFLAGS", "/D ZTS=1"); ADD_FLAG("ZTS", "1"); } else { ADD_FLAG("ZTS", "0"); diff --git a/win32/globals.c b/win32/globals.c index 47f4ebacce..ec4180db38 100644 --- a/win32/globals.c +++ b/win32/globals.c @@ -23,7 +23,7 @@ #include "syslog.h" #ifdef ZTS -TSRMG_D(php_win32_core_globals, php_win32_core_globals_id); +PHPAPI int php_win32_core_globals_id; #else php_win32_core_globals the_php_win32_core_globals; #endif diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index ae975dcb31..42f5ec9411 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -27,7 +27,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) -TSRMG_DH(php_win32_core_globals, php_win32_core_globals_id); +extern PHPAPI int php_win32_core_globals_id; #else # define PW32G(v) (the_php_win32_core_globals.v) extern PHPAPI struct _php_win32_core_globals the_php_win32_core_globals; -- cgit v1.2.1 From d6096f6036173ebfe1db33489b0d4d7a43f181aa Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 12:13:36 +0200 Subject: cleanup TSRMLS_FETCH in win32 --- win32/readdir.c | 1 - win32/wsyslog.c | 4 ---- 2 files changed, 5 deletions(-) (limited to 'win32') diff --git a/win32/readdir.c b/win32/readdir.c index 0edd5764d4..2aba14ddf5 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/wsyslog.c b/win32/wsyslog.c index 75c5ef58e5..89f98e5224 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,8 +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(); } -- cgit v1.2.1 From 76081df168829a5cc0409fac47c217d4927ec6f6 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 1 Oct 2014 22:04:21 +0200 Subject: using pointer to the tsrm ls cache instead of a function call yet another approach --- win32/build/config.w32 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'win32') diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 5806343518..613fc55f33 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -365,6 +365,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"); + if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); } -- cgit v1.2.1 From b946348969c7d1fe5c666510d59151cdf7184586 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 5 Oct 2014 19:49:41 +0200 Subject: enable static tsrm ls cache in ext/standard --- win32/php_win32_globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 42f5ec9411..4029117b8f 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) -- cgit v1.2.1 From c00424e427930a33e6d8645cc3f23fb78ed29b9f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 09:37:55 +0200 Subject: bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream --- win32/readdir.c | 1 + win32/wsyslog.c | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'win32') diff --git a/win32/readdir.c b/win32/readdir.c index 2aba14ddf5..0edd5764d4 100644 --- a/win32/readdir.c +++ b/win32/readdir.c @@ -26,6 +26,7 @@ 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/wsyslog.c b/win32/wsyslog.c index 89f98e5224..75c5ef58e5 100644 --- a/win32/wsyslog.c +++ b/win32/wsyslog.c @@ -61,6 +61,7 @@ void closelog(void) { + TSRMLS_FETCH(); if (PW32G(log_source)) { DeregisterEventSource(PW32G(log_source)); PW32G(log_source) = NULL; @@ -84,6 +85,7 @@ void syslog(int priority, const char *message, ...) unsigned short etype; char *tmp = NULL; DWORD evid; + TSRMLS_FETCH(); /* default event source */ if (!PW32G(log_source)) @@ -121,6 +123,8 @@ void syslog(int priority, const char *message, ...) void openlog(const char *ident, int logopt, int facility) { + TSRMLS_FETCH(); + if (PW32G(log_source)) { closelog(); } -- cgit v1.2.1 From 8aeffdd74c826b5012c9b052848cfa8e593776ed Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 16:33:40 +0200 Subject: moved most of the core to use static tsrm ls cache pointer plus apache2handler, cli and cgi --- win32/build/config.w32 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'win32') diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 54fadc09b3..d618ccb3bc 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -378,6 +378,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 @@ -390,10 +391,13 @@ if (VCVERS >= 1400) { 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); -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- win32/globals.c | 4 ++-- win32/php_registry.h | 2 +- win32/php_win32_globals.h | 4 ++-- win32/readdir.c | 1 - win32/registry.c | 2 +- win32/sendmail.c | 24 ++++++++++++------------ win32/sendmail.h | 6 +++--- win32/wsyslog.c | 3 --- 8 files changed, 21 insertions(+), 25 deletions(-) (limited to 'win32') 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 4029117b8f..4341a99959 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -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(); -- cgit v1.2.1