org.handhelds.familiar/packages/xscreensaver/files/fixes.patch

   1 diff --exclude '*.o' -u xscreensaver-4.16/hacks/bouboule.c xscreensaver-4.16.new/hacks/bouboule.c
   2 --- xscreensaver-4.16/hacks/bouboule.c  2003-10-18 17:29:50.000000000 -0700
   3 +++ xscreensaver-4.16.new/hacks/bouboule.c      2004-08-06 13:44:21.282983912 -0700
   4 @@ -105,7 +105,7 @@
   5                                    * erase the whole window than to erase each star
   6                                  */
   7
   8 -#if HAVE_GETTIMEOFDAY
   9 +#ifdef HAVE_GETTIMEOFDAY
  10  #define ADAPT_ERASE  1         /* If 1, then we try ADAPT_CHECKS black XFillArcs,
  11                                    * and after, ADAPT_CHECKS XFillRectangle.
  12                                    * We check which method seems better, knowing that
  13 diff --exclude '*.o' -u xscreensaver-4.16/hacks/speedmine.c xscreensaver-4.16.new/hacks/speedmine.c
  14 --- xscreensaver-4.16/hacks/speedmine.c 2003-05-19 21:31:29.000000000 -0700
  15 +++ xscreensaver-4.16.new/hacks/speedmine.c     2004-08-06 13:46:25.056167528 -0700
  16 @@ -174,7 +174,7 @@
  17  /* a forward declaration ... */
  18  static void change_colors(void);
  19
  20 -#if HAVE_GETTIMEOFDAY
  21 +#ifdef HAVE_GETTIMEOFDAY
  22  static int total_nframes = 0;
  23  static int nframes = 0;
  24  static double fps = 0.0;
  25 @@ -189,7 +189,7 @@
  26  static double get_time(void) {
  27    struct timeval t;
  28    float f;
  29 -#if GETTIMEOFDAY_TWO_ARGS
  30 +#ifdef GETTIMEOFDAY_TWO_ARGS
  31    gettimeofday(&t, NULL);
  32  #else
  33    gettimeofday(&t);
  34 @@ -205,7 +205,7 @@
  35   * initialises the timing structures
  36   */
  37  static void init_time(void) {
  38 -#if GETTIMEOFDAY_TWO_ARGS
  39 +#ifdef GETTIMEOFDAY_TWO_ARGS
  40    gettimeofday(&start_time, NULL);
  41  #else
  42    gettimeofday(&start_time);
  43 @@ -1194,7 +1194,7 @@
  44         render_speedmine (dpy, dbuf);
  45         XCopyArea (dpy, dbuf, window, draw_gc, 0, 0, width, height, 0, 0);
  46
  47 -#if HAVE_GETTIMEOFDAY
  48 +#ifdef HAVE_GETTIMEOFDAY
  49         fps_end = get_time();
  50         nframes++;
  51         total_nframes++;
  52 diff --exclude '*.o' -u xscreensaver-4.16/hacks/xrayswarm.c xscreensaver-4.16.new/hacks/xrayswarm.c
  53 --- xscreensaver-4.16/hacks/xrayswarm.c 2003-07-21 01:05:51.000000000 -0700
  54 +++ xscreensaver-4.16.new/hacks/xrayswarm.c     2004-08-06 13:47:01.984553560 -0700
  55 @@ -980,10 +980,10 @@
  56    }
  57  }
  58
  59 -#if HAVE_GETTIMEOFDAY
  60 +#ifdef HAVE_GETTIMEOFDAY
  61  static struct timeval startupTime;
  62  static void initTime(void) {
  63 -#if GETTIMEOFDAY_TWO_ARGS
  64 +#ifdef GETTIMEOFDAY_TWO_ARGS
  65    gettimeofday(&startupTime, NULL);
  66  #else
  67    gettimeofday(&startupTime);
  68 @@ -993,7 +993,7 @@
  69  static double getTime(void) {
  70    struct timeval t;
  71    float f;
  72 -#if GETTIMEOFDAY_TWO_ARGS
  73 +#ifdef GETTIMEOFDAY_TWO_ARGS
  74    gettimeofday(&t, NULL);
  75  #else
  76    gettimeofday(&t);
  77 @@ -1033,7 +1033,7 @@
  78    }
  79
  80    nframes = 0;
  81 -#if HAVE_GETTIMEOFDAY
  82 +#ifdef HAVE_GETTIMEOFDAY
  83    start = getTime();
  84  #endif
  85
  86 @@ -1055,7 +1055,7 @@
  87        XSync(dpy, False);
  88        screenhack_handle_events (dpy);
  89      }
  90 -#if HAVE_GETTIMEOFDAY
  91 +#ifdef HAVE_GETTIMEOFDAY
  92      end = getTime();
  93      nframes++;
  94