diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am index c792ce29c2..1957d284d6 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am @@ -4,6 +4,7 @@ libgstallocators_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API libgstallocators_@GST_API_VERSION@_include_HEADERS = \ allocators.h \ + allocators-prelude.h \ gstfdmemory.h \ gstphysmemory.h \ gstdmabuf.h diff --git a/gst-libs/gst/allocators/allocators-prelude.h b/gst-libs/gst/allocators/allocators-prelude.h new file mode 100644 index 0000000000..0aa84e063c --- /dev/null +++ b/gst-libs/gst/allocators/allocators-prelude.h @@ -0,0 +1,31 @@ +/* GStreamer Allocators Library + * Copyright (C) 2018 GStreamer developers + * + * allocators-prelude.h: prelude include header for gst-allocators library + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_ALLOCATORS_PRELUDE_H__ +#define __GST_ALLOCATORS_PRELUDE_H__ + +#include + +#ifndef GST_ALLOCATORS_API +#define GST_ALLOCATORS_API GST_EXPORT +#endif + +#endif /* __GST_ALLOCATORS_PRELUDE_H__ */ diff --git a/gst-libs/gst/allocators/allocators.h b/gst-libs/gst/allocators/allocators.h index 26c60f8cba..b616aa20e6 100644 --- a/gst-libs/gst/allocators/allocators.h +++ b/gst-libs/gst/allocators/allocators.h @@ -22,6 +22,8 @@ #ifndef __GST_ALLOCATORS_H__ #define __GST_ALLOCATORS_H__ +#include + #include #include #include diff --git a/gst-libs/gst/allocators/gstdmabuf.h b/gst-libs/gst/allocators/gstdmabuf.h index 364067f2d1..dd5e94fe58 100644 --- a/gst-libs/gst/allocators/gstdmabuf.h +++ b/gst-libs/gst/allocators/gstdmabuf.h @@ -95,19 +95,19 @@ struct _GstDmaBufAllocatorClass }; -GST_EXPORT +GST_ALLOCATORS_API GType gst_dmabuf_allocator_get_type (void); -GST_EXPORT +GST_ALLOCATORS_API GstAllocator * gst_dmabuf_allocator_new (void); -GST_EXPORT +GST_ALLOCATORS_API GstMemory * gst_dmabuf_allocator_alloc (GstAllocator * allocator, gint fd, gsize size); -GST_EXPORT +GST_ALLOCATORS_API gint gst_dmabuf_memory_get_fd (GstMemory * mem); -GST_EXPORT +GST_ALLOCATORS_API gboolean gst_is_dmabuf_memory (GstMemory * mem); diff --git a/gst-libs/gst/allocators/gstfdmemory.h b/gst-libs/gst/allocators/gstfdmemory.h index 81aea0468f..6693593b0f 100644 --- a/gst-libs/gst/allocators/gstfdmemory.h +++ b/gst-libs/gst/allocators/gstfdmemory.h @@ -22,6 +22,7 @@ #define __GST_FD_ALLOCATOR_H__ #include +#include G_BEGIN_DECLS @@ -76,20 +77,20 @@ struct _GstFdAllocatorClass GstAllocatorClass parent_class; }; -GST_EXPORT +GST_ALLOCATORS_API GType gst_fd_allocator_get_type (void); -GST_EXPORT +GST_ALLOCATORS_API GstAllocator * gst_fd_allocator_new (void); -GST_EXPORT +GST_ALLOCATORS_API GstMemory * gst_fd_allocator_alloc (GstAllocator * allocator, gint fd, gsize size, GstFdMemoryFlags flags); -GST_EXPORT +GST_ALLOCATORS_API gboolean gst_is_fd_memory (GstMemory *mem); -GST_EXPORT +GST_ALLOCATORS_API gint gst_fd_memory_get_fd (GstMemory *mem); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC diff --git a/gst-libs/gst/allocators/gstphysmemory.h b/gst-libs/gst/allocators/gstphysmemory.h index 7c70d6871a..2aa69e47a2 100644 --- a/gst-libs/gst/allocators/gstphysmemory.h +++ b/gst-libs/gst/allocators/gstphysmemory.h @@ -21,6 +21,7 @@ #define __GST_PHYS_MEMORY_H__ #include +#include G_BEGIN_DECLS @@ -49,13 +50,13 @@ struct _GstPhysMemoryAllocatorInterface guintptr (*get_phys_addr) (GstPhysMemoryAllocator * allocator, GstMemory * mem); }; -GST_EXPORT +GST_ALLOCATORS_API GType gst_phys_memory_allocator_get_type (void); -GST_EXPORT +GST_ALLOCATORS_API gboolean gst_is_phys_memory (GstMemory *mem); -GST_EXPORT +GST_ALLOCATORS_API guintptr gst_phys_memory_get_phys_addr (GstMemory * mem); G_END_DECLS diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build index a2ef0408f6..fc8b69659c 100644 --- a/gst-libs/gst/allocators/meson.build +++ b/gst-libs/gst/allocators/meson.build @@ -1,5 +1,6 @@ gst_allocators_headers = [ 'allocators.h', + 'allocators-prelude.h', 'gstfdmemory.h', 'gstphysmemory.h', 'gstdmabuf.h',