From: Sergey Scobich <sergey.scobich@gmail.com>
Date: Sat, 28 Oct 2006 15:10:26 +0000 (+0000)
Subject: Add needed entries in .def files.
X-Git-Tag: RELEASE-0_10_11~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4f604b7b1c5a2404d50b69472b9a12839eaeee9;p=platform%2Fupstream%2Fgstreamer.git

Add needed entries in .def files.

Original commit message from CVS:
Patch by: Sergey Scobich <sergey dot scobich at gmail dot com>
* gst/gst.c:
* win32/common/libgstbase.def:
* win32/common/libgstreamer.def:
* win32/vs8/libgstbase.vcproj:
* win32/vs8/libgstcontroller.vcproj:
Add needed entries in .def files.
Use HAVE_UNISTD_H.
Rearrange def files in vs8 solutions. Fixes #366286.
---

diff --git a/ChangeLog b/ChangeLog
index 254ecd67d8..713fcd9051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-28  Wim Taymans  <wim@fluendo.com>
+
+	Patch by: Sergey Scobich <sergey dot scobich at gmail dot com>
+
+	* gst/gst.c:
+	* win32/common/libgstbase.def:
+	* win32/common/libgstreamer.def:
+	* win32/vs8/libgstbase.vcproj:
+	* win32/vs8/libgstcontroller.vcproj:
+	Add needed entries in .def files.
+	Use HAVE_UNISTD_H.
+	Rearrange def files in vs8 solutions. Fixes #366286.
+
 2006-10-28  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* win32/common/gstconfig.h:
diff --git a/gst/gst.c b/gst/gst.c
index 554b4da2df..74af64d8df 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -107,7 +107,9 @@
 #ifdef HAVE_FORK
 #include <sys/wait.h>
 #endif /* HAVE_FORK */
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "gst-i18n-lib.h"
 #include <locale.h>             /* for LC_ALL */
diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index 25be1ac95a..a810c7e316 100644
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -16,12 +16,12 @@ EXPORTS
 	gst_base_sink_set_sync
 	gst_base_sink_set_qos_enabled
 	gst_base_sink_is_qos_enabled
+	gst_base_sink_wait_preroll
 	gst_base_src_get_type
 	gst_base_src_is_live
 	gst_base_src_set_format
 	gst_base_src_set_live
 	gst_base_src_wait_playing
-	gst_base_src_wait_preroll
 	gst_base_transform_get_type
 	gst_base_transform_is_in_place
 	gst_base_transform_is_passthrough
diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index f715c49853..f77848a606 100644
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -657,6 +657,7 @@ EXPORTS
 	gst_tag_list_merge
 	gst_tag_list_new
 	gst_tag_merge_mode_get_type
+	gst_tag_merge_use_first
 	gst_tag_register
 	gst_tag_setter_get_tag_list
 	gst_tag_setter_get_tag_merge_mode
diff --git a/win32/vs8/libgstbase.vcproj b/win32/vs8/libgstbase.vcproj
index 68583e391d..2b71f5e9d8 100644
--- a/win32/vs8/libgstbase.vcproj
+++ b/win32/vs8/libgstbase.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="libgstbase"
 	ProjectGUID="{4D7BC403-583B-4725-BD87-A4A2B7FD8156}"
 	Keyword="Win32Proj"
@@ -211,10 +211,6 @@
 				RelativePath="..\..\libs\gst\base\gsttypefindhelper.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\libgstbase.def"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -227,6 +223,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath="..\common\libgstbase.def"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/win32/vs8/libgstcontroller.vcproj b/win32/vs8/libgstcontroller.vcproj
index 25dc9c7a12..dded4ef9c5 100644
--- a/win32/vs8/libgstcontroller.vcproj
+++ b/win32/vs8/libgstcontroller.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="libgstcontroller"
 	ProjectGUID="{5B28E515-C92B-4CF2-9963-AC6EFB8B2A5C}"
 	Keyword="Win32Proj"
@@ -199,10 +199,6 @@
 				RelativePath="..\..\libs\gst\controller\lib.c"
 				>
 			</File>
-			<File
-				RelativePath="..\common\libgstcontroller.def"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -215,6 +211,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath="..\common\libgstcontroller.def"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>