diff options
author | Matthias Clasen <mclasen@redhat.com> | 2018-06-10 23:14:42 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2018-06-10 23:14:42 +0000 |
commit | 4f632296a57ee3df809c2a405ac5fb93550aa98e (patch) | |
tree | d703da62e1b48a39c8dd36ef58c01f1296ad0e8c /gsk | |
parent | c047e97cfa7914e0b3ba032a1eb2ac08d9bc7fd8 (diff) | |
parent | 43f37894b02e74d87c0474d20ea74e7997d0b872 (diff) | |
download | gtk+-4f632296a57ee3df809c2a405ac5fb93550aa98e.tar.gz |
Merge branch 'lrn/gtk4warnings' into 'master'
Fix a lot of warnings in GTK4
See merge request GNOME/gtk!188
Diffstat (limited to 'gsk')
-rw-r--r-- | gsk/gl/gskgldriver.c | 6 | ||||
-rw-r--r-- | gsk/gskprofiler.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index 3f6c4c70d0..2a2c980ce4 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -217,9 +217,9 @@ gsk_gl_driver_end_frame (GskGLDriver *self) #ifdef G_ENABLE_DEBUG GSK_NOTE (OPENGL, - g_message ("Textures created: %ld\n" - " Textures reused: %ld\n" - " Surface uploads: %ld", + g_message ("Textures created: %" G_GINT64_FORMAT "\n" + " Textures reused: %" G_GINT64_FORMAT "\n" + " Surface uploads: %" G_GINT64_FORMAT, gsk_profiler_counter_get (self->profiler, self->counters.created_textures), gsk_profiler_counter_get (self->profiler, self->counters.reused_textures), gsk_profiler_counter_get (self->profiler, self->counters.surface_uploads))); diff --git a/gsk/gskprofiler.c b/gsk/gskprofiler.c index 2a09702826..253a0b6282 100644 --- a/gsk/gskprofiler.c +++ b/gsk/gskprofiler.c @@ -503,7 +503,7 @@ gsk_profiler_append_timers (GskProfiler *profiler, if (timer->n_samples > 1) { timer->avg_value = timer->avg_value / timer->n_samples; - g_string_append_printf (buffer, " Min: %.2f Avg: %.2f Max: %.2f (%ld samples)", + g_string_append_printf (buffer, " Min: %.2f Avg: %.2f Max: %.2f (%" G_GINT64_FORMAT " samples)", (double) timer->min_value / scale, (double) timer->avg_value / scale, (double) timer->max_value / scale, |