From 05bbd1b11af52491106cff97df3ef703e55c7536 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 8 Jul 2013 15:26:38 +0100 Subject: [PATCH] allocator: fix type of gst_memory_alignment to match declaration Fixes compiler warnings such as gstallocator.c:61:8: error: conflicting types for 'gst_memory_alignment' ../gst/gstallocator.h:52:18: note: previous declaration of 'gst_memory_alignment' was here --- gst/gstallocator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/gstallocator.c b/gst/gstallocator.c index a6e6039..63b44bc 100644 --- a/gst/gstallocator.c +++ b/gst/gstallocator.c @@ -58,15 +58,15 @@ struct _GstAllocatorPrivate }; #if defined(MEMORY_ALIGNMENT_MALLOC) -size_t gst_memory_alignment = 7; +gsize gst_memory_alignment = 7; #elif defined(MEMORY_ALIGNMENT_PAGESIZE) /* we fill this in in the _init method */ -size_t gst_memory_alignment = 0; +gsize gst_memory_alignment = 0; #elif defined(MEMORY_ALIGNMENT) -size_t gst_memory_alignment = MEMORY_ALIGNMENT - 1; +gsize gst_memory_alignment = MEMORY_ALIGNMENT - 1; #else #error "No memory alignment configured" -size_t gst_memory_alignment = 0; +gsize gst_memory_alignment = 0; #endif /* the default allocator */ -- 2.7.4