mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 21:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

allocator: fix type of gst_memory_alignment to match declaration

Browse source 
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
This commit is contained in:
Tim-Philipp Müller 2013-07-08 15:26:38 +01:00
parent 766f754e01
commit 05bbd1b11a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gstallocator.c
View file

@ -58,15 +58,15 @@ struct _GstAllocatorPrivate
}; };
#if defined(MEMORY_ALIGNMENT_MALLOC) #if defined(MEMORY_ALIGNMENT_MALLOC)
size_t gst_memory_alignment = 7; gsize gst_memory_alignment = 7;
#elif defined(MEMORY_ALIGNMENT_PAGESIZE) #elif defined(MEMORY_ALIGNMENT_PAGESIZE)
/* we fill this in in the _init method */ /* we fill this in in the _init method */
size_t gst_memory_alignment = 0; gsize gst_memory_alignment = 0;
#elif defined(MEMORY_ALIGNMENT) #elif defined(MEMORY_ALIGNMENT)
size_t gst_memory_alignment = MEMORY_ALIGNMENT - 1; gsize gst_memory_alignment = MEMORY_ALIGNMENT - 1;
#else #else
#error "No memory alignment configured" #error "No memory alignment configured"
size_t gst_memory_alignment = 0; gsize gst_memory_alignment = 0;
#endif #endif
/* the default allocator */ /* the default allocator */