From a770d7a70760ad4bbdbad22d2902e65148570eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Sat, 23 Oct 2010 01:12:49 +0200 Subject: [PATCH] shmalloc: Manually decide to use GLib or not in the shmalloc So make it easier for embedders to use it with or without Glib --- sys/shm/Makefile.am | 2 +- sys/shm/shmalloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/shm/Makefile.am b/sys/shm/Makefile.am index fdc034b71c..bfe7b49feb 100644 --- a/sys/shm/Makefile.am +++ b/sys/shm/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/common/glib-gen.mak plugin_LTLIBRARIES = libgstshm.la libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c -libgstshm_la_CFLAGS = $(GST_CFLAGS) +libgstshm_la_CFLAGS = $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB libgstshm_la_LIBADD = -lrt libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstshm_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/shm/shmalloc.h b/sys/shm/shmalloc.h index d5aa581ef2..c3d33656a7 100644 --- a/sys/shm/shmalloc.h +++ b/sys/shm/shmalloc.h @@ -27,7 +27,7 @@ #ifndef __SHMALLOC_H__ #define __SHMALLOC_H__ -#ifdef GST_PACKAGE_NAME +#ifdef SHM_PIPE_USE_GLIB #include #define spalloc_new(type) g_slice_new (type)