projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "bin: Hold the state lock while removing elements from a bin"
[platform/upstream/gstreamer.git]
/
gst
/
glib-compat.h
diff --git
a/gst/glib-compat.h
b/gst/glib-compat.h
index
77b221d
..
5fb267b
100644
(file)
--- a/
gst/glib-compat.h
+++ b/
gst/glib-compat.h
@@
-15,8
+15,8
@@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
*
* 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., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * Free Software Foundation, Inc., 5
1 Franklin St, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA.
*/
*/
@@
-30,16
+30,9
@@
#ifndef __GST_GLIB_COMPAT_H__
#define __GST_GLIB_COMPAT_H__
#ifndef __GST_GLIB_COMPAT_H__
#define __GST_GLIB_COMPAT_H__
-G_BEGIN_DECLS
+#include <glib.h>
-/* added in GLib 2.8 */
-#if !GLIB_CHECK_VERSION (2, 8, 0)
-#if __GNUC__ >= 4
-#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define G_GNUC_NULL_TERMINATED
-#endif
-#endif
+G_BEGIN_DECLS
G_END_DECLS
G_END_DECLS