ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.399 by root, Mon Sep 26 12:32:21 2011 UTC vs.
Revision 1.401 by root, Tue Dec 20 04:08:35 2011 UTC

1193 #undef VAR 1193 #undef VAR
1194 }; 1194 };
1195 #include "ev_wrap.h" 1195 #include "ev_wrap.h"
1196 1196
1197 static struct ev_loop default_loop_struct; 1197 static struct ev_loop default_loop_struct;
1198 struct ev_loop *ev_default_loop_ptr; 1198 EV_API_DECL struct ev_loop *ev_default_loop_ptr = 0; /* needs to be initialised to make it a defintiino despite extern */
1199 1199
1200#else 1200#else
1201 1201
1202 ev_tstamp ev_rt_now; 1202 EV_API_DECL ev_tstamp ev_rt_now = 0; /* needs to be initialised to make it a defintiino despite extern */
1203 #define VAR(name,decl) static decl; 1203 #define VAR(name,decl) static decl;
1204 #include "ev_vars.h" 1204 #include "ev_vars.h"
1205 #undef VAR 1205 #undef VAR
1206 1206
1207 static int ev_default_loop_ptr; 1207 static int ev_default_loop_ptr;
1301 1301
1302 do 1302 do
1303 ncur <<= 1; 1303 ncur <<= 1;
1304 while (cnt > ncur); 1304 while (cnt > ncur);
1305 1305
1306 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */ 1306 /* if size is large, round to MALLOC_ROUND - 4 * longs to accommodate malloc overhead */
1307 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4) 1307 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
1308 { 1308 {
1309 ncur *= elem; 1309 ncur *= elem;
1310 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1); 1310 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
1311 ncur = ncur - sizeof (void *) * 4; 1311 ncur = ncur - sizeof (void *) * 4;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines