summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-08-10 02:53:21 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-08-10 02:53:21 +0000
commit187aa7751b7d0a577cf8d7168389eff4ae3ba1f4 (patch)
treec0447941b790f77a9694ba94917f1fe84940f2e2
parent23f1d7366ad11364598d3468494547fff4b4ea6e (diff)
backport 62268
SVN revision: 62273
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/eina_hamster.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6540d90..f8c2919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,3 +23,7 @@
23 23
24 * Fix static linking with eina (iconv could potentially not be 24 * Fix static linking with eina (iconv could potentially not be
25 passed to the linker) 25 passed to the linker)
26
272011-08-09 Mike McCormack
28
29 * Fix eina_hamster_count on some machines
diff --git a/src/lib/eina_hamster.c b/src/lib/eina_hamster.c
index 2f68777..295891a 100644
--- a/src/lib/eina_hamster.c
+++ b/src/lib/eina_hamster.c
@@ -76,7 +76,7 @@ eina_hamster_count(void)
76 int monnum = 0, day = 0, year = 0; 76 int monnum = 0, day = 0, year = 0;
77 int fields; 77 int fields;
78 78
79 fields = sscanf(_eina_hamster_time, "%02i:%02i:%02i", &hrs, &min, &sec); 79 fields = sscanf(_eina_hamster_time, "%02d:%02d:%02d", &hrs, &min, &sec);
80 if (fields == 3) 80 if (fields == 3)
81 { 81 {
82 _eina_hamsters = (hrs * 60) + min; 82 _eina_hamsters = (hrs * 60) + min;