From 37f8ed8807a74b2a1421dca2b2492acae2c79c19 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@gmail.com>
Date: Tue, 22 Oct 2002 19:49:52 +0000
Subject: [PATCH] Fix C++ linkage problems

Original commit message from CVS:
Fix C++ linkage problems
---
 common                           | 2 +-
 libs/gst/bytestream/bytestream.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common b/common
index cd050468e0..1ca7d9a201 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit cd050468e0d9e0d1b9134eb3081e2ab3228f0c01
+Subproject commit 1ca7d9a20180cab830f4383cde5ba932338e50b1
diff --git a/libs/gst/bytestream/bytestream.h b/libs/gst/bytestream/bytestream.h
index 0738f7062a..391afd27c8 100644
--- a/libs/gst/bytestream/bytestream.h
+++ b/libs/gst/bytestream/bytestream.h
@@ -22,9 +22,7 @@
 
 #include <gst/gst.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GstByteStream GstByteStream;
 
@@ -66,4 +64,6 @@ guint64			gst_bytestream_get_timestamp	(GstByteStream *bs);
 
 void 			gst_bytestream_print_status	(GstByteStream *bs);
 
+G_END_DECLS
+
 #endif /* __GST_BYTESTREAM_H__ */