summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2018-07-06 17:27:23 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2018-07-06 18:11:54 +0200
commit204ff1ae2efddb5d7ac7b641fb8f5b2f43dc6ba7 (patch)
tree5087ded1ce2f5c520fc7e750738a6c7cdb1168fd
parentb4e07c31cfbf7a4aacd63870b9ef3b10535e4e6b (diff)
pixman: Use g_error() rather than g_abort()
g_abort() was only added in glib 2.50, which causes meson build failures since this defines GLIB_VERSION_MIN_REQUIRED/GLIB_VERSION_MAX_ALLOWED Signed-off-by: Christophe Fergeau <cfergeau@redhat.com> Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
-rw-r--r--common/pixman_utils.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index b7cf25c..c573574 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -935,8 +935,7 @@ pixman_format_code_t spice_surface_format_to_pixman(uint32_t surface_format)
case SPICE_SURFACE_FMT_32_ARGB:
return PIXMAN_a8r8g8b8;
default:
- printf("Unknown surface format %d\n", surface_format);
- g_abort();
+ g_error("Unknown surface format %d\n", surface_format);
break;
}
return (pixman_format_code_t)0; /* Not reached */
@@ -974,8 +973,7 @@ pixman_format_code_t spice_bitmap_format_to_pixman(int bitmap_format,
case SPICE_BITMAP_FMT_INVALID:
default:
- printf("Unknown bitmap format %d\n", bitmap_format);
- g_abort();
+ g_error("Unknown bitmap format %d\n", bitmap_format);
return PIXMAN_a8r8g8b8;
}
}