Merge branch 'PHP-5.5'

laruence · laruence · commit 0acdeec743bb · 2013-04-18T17:33:21.000+08:00
diff --git a/ext/opcache/shared_alloc_shm.c b/ext/opcache/shared_alloc_shm.c
@@ -111,7 +111,7 @@ static int create_segments(size_t requested_size, zend_shared_segment_shm ***sha
 		}
 
 		shared_segments[i].common.p = shmat(shared_segments[i].shm_id, NULL, 0);
-		if (((int) shared_segments[i].common.p) == -1) {
+		if (shared_segments[i].common.p == (void *)-1) {
 			*error_in = "shmat";
 			shmctl(shared_segments[i].shm_id, IPC_RMID, &sds);
 			return ALLOC_FAILURE;
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -137,7 +137,7 @@ static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, int
 		int i;
 		/* cleanup */
 		for (i = 0; i < *shared_segments_count; i++) {
-			if ((*shared_segments_p)[i]->p && (int)(*shared_segments_p)[i]->p != -1) {
+			if ((*shared_segments_p)[i]->p && (*shared_segments_p)[i]->p != (void *)-1) {
 				S_H(detach_segment)((*shared_segments_p)[i]);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ static int create_segments(size_t requested_size, zend_shared_segment_shm ***sha`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`shared_segments[i].common.p = shmat(shared_segments[i].shm_id, NULL, 0);`
`114`		`- if (((int) shared_segments[i].common.p) == -1) {`
	`114`	`+ if (shared_segments[i].common.p == (void *)-1) {`
`115`	`115`	`*error_in = "shmat";`
`116`	`116`	`shmctl(shared_segments[i].shm_id, IPC_RMID, &sds);`
`117`	`117`	`return ALLOC_FAILURE;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ static int zend_shared_alloc_try(const zend_shared_memory_handler_entry *he, int`
`137`	`137`	`int i;`
`138`	`138`	`/* cleanup */`
`139`	`139`	`for (i = 0; i < *shared_segments_count; i++) {`
`140`		`- if ((shared_segments_p)[i]->p && (int)(shared_segments_p)[i]->p != -1) {`
	`140`	`+ if ((shared_segments_p)[i]->p && (shared_segments_p)[i]->p != (void *)-1) {`
`141`	`141`	`S_H(detach_segment)((*shared_segments_p)[i]);`
`142`	`142`	`}`
`143`	`143`	`}`