diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-07-08 15:26:38 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-07-08 15:26:38 +0100 |
| commit | 05bbd1b11af52491106cff97df3ef703e55c7536 (patch) | |
| tree | 6084d41da0c72e9c102e268f989ad60b0f42c35f /gst/gstallocator.c | |
| parent | 766f754e01a62a8ccbeb28c6bd5966485c340a79 (diff) | |
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
Diffstat (limited to 'gst/gstallocator.c')
| -rw-r--r-- | gst/gstallocator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/gstallocator.c b/gst/gstallocator.c index a6e6039de..63b44bcce 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 */ |