projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.14.tar.gz
[xscreensaver]
/
hacks
/
juggle.c
diff --git
a/hacks/juggle.c
b/hacks/juggle.c
index 758d2576f145e37a3e002ea5b72b94ac61c87587..8080ccb334b35ab485748b2950cef06aa37af662 100644
(file)
--- a/
hacks/juggle.c
+++ b/
hacks/juggle.c
@@
-1,9
+1,8
@@
/* -*- Mode: C; tab-width: 4 -*- */
/* juggle */
/* -*- Mode: C; tab-width: 4 -*- */
/* juggle */
-#if
!defined( lint ) && !defined( SABER )
+#if
0
static const char sccsid[] = "@(#)juggle.c 5.00 2000/11/01 xlockmore";
static const char sccsid[] = "@(#)juggle.c 5.00 2000/11/01 xlockmore";
-
#endif
/*-
#endif
/*-
@@
-100,7
+99,6
@@
so the answer is to do a single 661 and then drop straight down to (5).
into the Adam notation, [*] which means 'lose the current ball'.]
*/
into the Adam notation, [*] which means 'lose the current ball'.]
*/
-#define STANDALONE
#ifdef STANDALONE
#define MODE_juggle
#define PROGCLASS "Juggle"
#ifdef STANDALONE
#define MODE_juggle
#define PROGCLASS "Juggle"
@@
-1133,7
+1131,6
@@
init_juggle(ModeInfo * mi)
}
if (pattern == NULL && patternindex == NULL) {
/* pattern list needs indexing */
}
if (pattern == NULL && patternindex == NULL) {
/* pattern list needs indexing */
- int i;
int nelements = sizeof(portfolio)/sizeof(patternstruct);
int maxballs;
int numpat = 0;
int nelements = sizeof(portfolio)/sizeof(patternstruct);
int maxballs;
int numpat = 0;
@@
-1476,7
+1473,13
@@
draw_juggle(ModeInfo * mi)
{
struct timeval tv;
{
struct timeval tv;
- (void)gettimeofday(&tv, NULL);
+# ifdef GETTIMEOFDAY_TWO_ARGS
+ struct timezone tzp;
+ gettimeofday(&tv, &tzp);
+# else
+ gettimeofday(&tv);
+# endif
+
sp->time = (int) ((tv.tv_sec - sp->begintime)*1000 + tv.tv_usec/1000);
}
for (traj = sp->head->next; traj != sp->head; traj = traj->next) {
sp->time = (int) ((tv.tv_sec - sp->begintime)*1000 + tv.tv_usec/1000);
}
for (traj = sp->head->next; traj != sp->head; traj = traj->next) {