1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 17:08:14 +02:00

Merge branch 'PHP-5.5'

* PHP-5.5:
  Use size_t instead of int
This commit is contained in:
Dmitry Stogov
2013-06-10 10:37:53 +04:00
+2 -2
View File
@@ -99,9 +99,9 @@ void zend_shared_alloc_create_lock(void)
}
#endif
static void no_memory_bailout(int allocate_size, char *error)
static void no_memory_bailout(size_t allocate_size, char *error)
{
zend_accel_error(ACCEL_LOG_FATAL, "Unable to allocate shared memory segment of %d bytes: %s: %s (%d)", allocate_size, error?error:"unknown", strerror(errno), errno );
zend_accel_error(ACCEL_LOG_FATAL, "Unable to allocate shared memory segment of %ld bytes: %s: %s (%d)", allocate_size, error?error:"unknown", strerror(errno), errno );
}
static void copy_shared_segments(void *to, void *from, int count, int size)