projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
hacks
/
glx
/
flurry.c
diff --git
a/hacks/glx/flurry.c
b/hacks/glx/flurry.c
index 63b89f666a83b42b49d62fa14a66e14e4a44325d..51a241bc364ed872daaf98c1d09c74d152f7becc 100644
(file)
--- a/
hacks/glx/flurry.c
+++ b/
hacks/glx/flurry.c
@@
-37,16
+37,10
@@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* flurry */
/* flurry */
-#if
!defined( lint ) && !defined( SABER )
+#if
0
static const char sccsid[] = "@(#)flurry.c 4.07 97/11/24 xlockmore";
static const char sccsid[] = "@(#)flurry.c 4.07 97/11/24 xlockmore";
-
#endif
#endif
-/*-
- * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock.
- * otherwise caddr_t is not defined correctly
- */
-
#define DEF_PRESET "classic"
#define DEF_BRIGHTNESS "8"
#define DEF_PRESET "classic"
#define DEF_BRIGHTNESS "8"
@@
-71,7
+65,7
@@
static XrmOptionDescRec opts[] = {
};
static argtype vars[] = {
};
static argtype vars[] = {
- {
(caddr_t *)
&preset_str, "preset", "Preset", DEF_PRESET, t_String},
+ {&preset_str, "preset", "Preset", DEF_PRESET, t_String},
};
#define countof(x) (sizeof((x))/sizeof((*x)))
};
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-107,8
+101,12
@@
static double gTimeCounter = 0.0;
double currentTime(void) {
struct timeval tv;
double currentTime(void) {
struct timeval tv;
-
- gettimeofday(&tv, NULL);
+# ifdef GETTIMEOFDAY_TWO_ARGS
+ struct timezone tzp;
+ gettimeofday(&tv, &tzp);
+# else
+ gettimeofday(&tv);
+# endif
return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
}
return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
}