diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-10-07 16:13:24 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-10-07 16:13:24 +0200 |
| commit | 88d0201a89d35311d9ef0c3bef128244c687708e (patch) | |
| tree | e093a5f4c137828ab8e08a842cab910bd175f1f6 | |
| parent | 4790da5475c80469eeaac777f3f04815648e3d96 (diff) | |
| download | php-git-88d0201a89d35311d9ef0c3bef128244c687708e.tar.gz | |
Document that ext/shmop deals with resources as of PHP 7.0.0
| -rw-r--r-- | UPGRADING | 3 | ||||
| -rw-r--r-- | ext/shmop/shmop.c | 12 |
2 files changed, 9 insertions, 6 deletions
@@ -727,6 +727,9 @@ out, that the corresponding SDK isn't available anymore. - Openssl minimum supported OpenSSL version series was raised to 0.9.8 +- Shmop + The shmop identifiers have been changed from ints to resources of type shmop. + ======================================== 10. New Global Constants ======================================== diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index d647790aa0..29315d32f9 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -142,7 +142,7 @@ PHP_MINFO_FUNCTION(shmop) } /* }}} */ -/* {{{ proto int shmop_open (int key, string flags, int mode, int size) +/* {{{ proto resource shmop_open (int key, string flags, int mode, int size) gets and attaches a shared memory segment */ PHP_FUNCTION(shmop_open) { @@ -223,7 +223,7 @@ err: } /* }}} */ -/* {{{ proto string shmop_read (int shmid, int start, int count) +/* {{{ proto string shmop_read (resource shmid, int start, int count) reads from a shm segment */ PHP_FUNCTION(shmop_read) { @@ -261,7 +261,7 @@ PHP_FUNCTION(shmop_read) } /* }}} */ -/* {{{ proto void shmop_close (int shmid) +/* {{{ proto void shmop_close (resource shmid) closes a shared memory segment */ PHP_FUNCTION(shmop_close) { @@ -281,7 +281,7 @@ PHP_FUNCTION(shmop_close) } /* }}} */ -/* {{{ proto int shmop_size (int shmid) +/* {{{ proto int shmop_size (resource shmid) returns the shm size */ PHP_FUNCTION(shmop_size) { @@ -300,7 +300,7 @@ PHP_FUNCTION(shmop_size) } /* }}} */ -/* {{{ proto int shmop_write (int shmid, string data, int offset) +/* {{{ proto int shmop_write (resource shmid, string data, int offset) writes to a shared memory segment */ PHP_FUNCTION(shmop_write) { @@ -335,7 +335,7 @@ PHP_FUNCTION(shmop_write) } /* }}} */ -/* {{{ proto bool shmop_delete (int shmid) +/* {{{ proto bool shmop_delete (resource shmid) mark segment for deletion */ PHP_FUNCTION(shmop_delete) { |