diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-02-01 21:25:15 +0100 |
commit | 96fb2ff5760132a915766f1d9ec7c63001feacd8 (patch) | |
tree | 160904a89a8f3522fa4e47632db101b045e7814a /ext/sysvmsg | |
parent | 8f1428d29ef91d74b4d272af171675f2971eb15b (diff) | |
download | php-96fb2ff5760132a915766f1d9ec7c63001feacd8.tar.gz |
Imported Upstream version 5.4.0~rc6upstream/5.4.0_rc6
Diffstat (limited to 'ext/sysvmsg')
-rw-r--r-- | ext/sysvmsg/sysvmsg.c | 2 | ||||
-rw-r--r-- | ext/sysvmsg/tests/006.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index a48c69b2e..06d230b40 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -271,7 +271,7 @@ PHP_FUNCTION(msg_get_queue) RETURN_FALSE; } } - RETVAL_RESOURCE(zend_list_insert(mq, le_sysvmsg)); + RETVAL_RESOURCE(zend_list_insert(mq, le_sysvmsg TSRMLS_CC)); } /* }}} */ diff --git a/ext/sysvmsg/tests/006.phpt b/ext/sysvmsg/tests/006.phpt index 675e5e114..cb4fd2457 100644 --- a/ext/sysvmsg/tests/006.phpt +++ b/ext/sysvmsg/tests/006.phpt @@ -10,7 +10,7 @@ $queue = msg_get_queue (ftok(__FILE__, 'r'), 0600); $tests = array('foo', 123, PHP_INT_MAX +1, true, 1.01, null, array('bar')); foreach ($tests as $elem) { - echo "Sending/receiving '$elem':\n"; + echo @"Sending/receiving '$elem':\n"; var_dump(msg_send($queue, 1, $elem, false)); unset($msg); |