Skip to content

Commit a4db743

Browse files
committed
Remove THREAD_LS
This sounds like it will give you a thread local storage, but in truth ... it does absolutely nothing.
1 parent 8400878 commit a4db743

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

ext/snmp/snmp.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ struct objid_query {
153153
ZEND_GET_MODULE(snmp)
154154
#endif
155155

156-
/* THREAD_LS snmp_module php_snmp_module; - may need one of these at some point */
157-
158156
/* {{{ PHP_GINIT_FUNCTION */
159157
static PHP_GINIT_FUNCTION(snmp)
160158
{

ext/sysvshm/php_sysvshm.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ extern zend_module_entry sysvshm_module_entry;
3030
#ifdef PHP_WIN32
3131
# include <TSRM/tsrm_win32.h>
3232
# include "win32/ipc.h"
33-
# ifndef THREAD_LS
34-
# define THREAD_LS
35-
# endif
3633
#else
3734
# include <sys/ipc.h>
3835
# include <sys/shm.h>

ext/sysvshm/sysvshm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ ZEND_GET_MODULE(sysvshm)
9090

9191
#undef shm_ptr /* undefine AIX-specific macro */
9292

93-
THREAD_LS sysvshm_module php_sysvshm;
93+
/* TODO: Make this thread-safe. */
94+
sysvshm_module php_sysvshm;
9495

9596
static int php_put_shm_data(sysvshm_chunk_head *ptr, zend_long key, const char *data, zend_long len);
9697
static zend_long php_check_shm_data(sysvshm_chunk_head *ptr, zend_long key);

main/php.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
# else
7171
# define PHPAPI
7272
# endif
73-
# define THREAD_LS
7473
# define PHP_DIR_SEPARATOR '/'
7574
# define PHP_EOL "\n"
7675
#endif

0 commit comments

Comments
 (0)