From c608c75b8335856c83789704891f3f1d044b9f50 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 24 Mar 2011 13:16:40 -0400 Subject: [PATCH] GnomeScreensaver::getTicks() returns uint64_t --- GnomeScreensaver.cc | 2 +- GnomeScreensaver.h | 2 +- modes/Spin.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GnomeScreensaver.cc b/GnomeScreensaver.cc index 6cf1c6f..68038f4 100644 --- a/GnomeScreensaver.cc +++ b/GnomeScreensaver.cc @@ -102,7 +102,7 @@ GnomeScreensaver::GnomeScreensaver(int *argc, char ***argv, gtk_timeout_add(interval_msec, update, this); } -uint32_t GnomeScreensaver::getTicks() +uint64_t GnomeScreensaver::getTicks() { struct timeval tv; gettimeofday(&tv, NULL); diff --git a/GnomeScreensaver.h b/GnomeScreensaver.h index 0914ad7..23e57c3 100644 --- a/GnomeScreensaver.h +++ b/GnomeScreensaver.h @@ -28,7 +28,7 @@ class GnomeScreensaver bool (*expose_callback)(GnomeScreensaver &), bool (*update_callback)(GnomeScreensaver &), int32_t interval_msec); - uint32_t getTicks(); + uint64_t getTicks(); void mainloop() { gtk_main(); } gboolean configureCB(GtkWidget *da, GdkEventConfigure *event); gboolean exposeCB(GtkWidget *da, GdkEventExpose *event); diff --git a/modes/Spin.h b/modes/Spin.h index b6869bf..46f873f 100644 --- a/modes/Spin.h +++ b/modes/Spin.h @@ -26,7 +26,7 @@ class Spin : public Mode LogoBox m_logobox; int m_num_monitors; monitor_info_t *m_monitor_info; - unsigned int m_last_ticks; + uint64_t m_last_ticks; void initMonitorInfo(); void getRandomAxis(float (*axis)[3]); uint32_t getRandomSwitchTime();