aboutsummaryrefslogtreecommitdiffhomepage
path: root/util.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2011-12-26 21:09:26 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2011-12-26 21:09:26 -0800
commit165a5aaa83d40079cb4fcc1e76fda4b1ed1f993e (patch)
tree54150e356bb426e553e500bb8d7c575f87eb02c7 /util.cpp
parent04856aded0ef416c4ff6e4468e30276dde525ec9 (diff)
parent8b407a32ffd2d62bb7c5d92db54d4ca738514d15 (diff)
Merge branch 'master' into CPlusPlus
Diffstat (limited to 'util.cpp')
-rw-r--r--util.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/util.cpp b/util.cpp
index 4adac257..bf3573b0 100644
--- a/util.cpp
+++ b/util.cpp
@@ -128,7 +128,7 @@ static int q_realloc( dyn_queue_t *q )
{
void **old_start = q->start;
void **old_stop = q->stop;
- int diff;
+ ptrdiff_t diff;
int new_size;
new_size = 2*(q->stop-q->start);