php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 15:38:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' into PHP-5.5-opcache

Browse Source 
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"
This commit is contained in:
Dmitry Stogov
2013-04-18 14:19:17 +04:00
parent 26c761915b 0704e4badb
commit 7deb3d41eb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/opcache/shared_alloc_shm.c
+1 -1
View File
@@ -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;
ext/opcache/zend_shared_alloc.c
+1 -1
View File
@@ -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]);
}
}