chiark / gitweb /
util: avoid non-portable __WORDSIZE
[elogind.git] / src / shared / logs-show.c
index 8edf4087c68f337ab76aed2c85f9d9a9dd0448e7..5a7bbaf03a92fa08dea2310a406f48ba8cf657b4 100644 (file)
@@ -695,7 +695,7 @@ static int output_json(
                         sd_id128_to_string(boot_id, sid));
         }
 
-        h = hashmap_new(string_hash_func, string_compare_func);
+        h = hashmap_new(&string_hash_ops);
         if (!h)
                 return -ENOMEM;
 
@@ -1032,7 +1032,7 @@ static int show_journal(FILE *f,
                 if (!(flags & OUTPUT_FOLLOW))
                         break;
 
-                r = sd_journal_wait(j, (usec_t) -1);
+                r = sd_journal_wait(j, USEC_INFINITY);
                 if (r < 0)
                         goto finish;