Merge branch 'master' into CPlusPlus

This commit is contained in:
ridiculousfish 2011-12-26 21:09:26 -08:00
commit 165a5aaa83

View file

@ -128,7 +128,7 @@ static int q_realloc( dyn_queue_t *q )
{ {
void **old_start = q->start; void **old_start = q->start;
void **old_stop = q->stop; void **old_stop = q->stop;
int diff; ptrdiff_t diff;
int new_size; int new_size;
new_size = 2*(q->stop-q->start); new_size = 2*(q->stop-q->start);