X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fblitspin.c;h=2be03cd1fb6076d7b4512728fdd39c08cc1e36a6;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=d00a9e2aa9e8db2a7b204dcb769773da6d6caec0;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver diff --git a/hacks/blitspin.c b/hacks/blitspin.c index d00a9e2a..2be03cd1 100644 --- a/hacks/blitspin.c +++ b/hacks/blitspin.c @@ -27,6 +27,7 @@ #include "screenhack.h" #include "xpm-pixmap.h" #include +#include #include "images/som.xbm" @@ -40,7 +41,7 @@ So, on OSX, we implement the blitter by hand. It is correct, but orders of magnitude slower. */ -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ # define USE_XCOPYAREA #endif @@ -154,7 +155,7 @@ blitspin_draw (Display *dpy, Window window, void *closure) st->first_time = 0; st->loaded_p = True; st->qwad = -1; - st->start_time = time ((time_t) 0); + st->start_time = time ((time_t *) 0); blitspin_init_2 (st); } @@ -165,7 +166,7 @@ blitspin_draw (Display *dpy, Window window, void *closure) if (!st->img_loader && st->load_ext_p && - st->start_time + st->duration < time ((time_t) 0)) { + st->start_time + st->duration < time ((time_t *) 0)) { /* Start a new image loading, but keep rotating the old image until the new one arrives. */ st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window, @@ -254,7 +255,7 @@ blitspin_init (Display *d_arg, Window w_arg) if (st->delay2 < 0) st->delay2 = 0; if (st->duration < 1) st->duration = 1; - st->start_time = time ((time_t) 0); + st->start_time = time ((time_t *) 0); bitmap_name = get_string_resource (st->dpy, "bitmap", "Bitmap"); if (! bitmap_name || !*bitmap_name) @@ -422,7 +423,7 @@ static const char *blitspin_defaults [] = { "*duration: 120", "*bitmap: (default)", "*geometry: 1080x1080", -#ifdef USE_IPHONE +#ifdef HAVE_MOBILE "*ignoreRotation: True", #endif 0