gst/rtsp/gstrtspsrc.c: Include unistd.h only if HAVE_UNISTD_H is defined

Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c:
Include unistd.h only if HAVE_UNISTD_H is defined
* win32/common/config.h.in:
* win32/common/config.h:
Define socklen_t as it seems it's not defined in default
Visual Studio headers.
* win32/vs6/libgstalpha.dsp:
* win32/vs6/libgstapetag.dsp:
* win32/vs6/libgstavi.dsp:
* win32/vs6/libgstrtp.dsp:
* win32/vs6/libgstrtsp.dsp:
* win32/vs6/libgstvideomixer.dsp:
Update project file dependencies and add new source files

8 files changed, 26 insertions, 16 deletions

diff --git a/win32/common/config.h b/win32/common/config.h
index 7f21b658..8776b8e7 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -274,3 +274,8 @@
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
+
+/* Define socklen_t as it seems to be not defined in default VS setup */
+#ifndef socklen_t
+typedef int socklen_t;
+#endif
\ No newline at end of file
diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index 554197e5..21b60390 100644
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -274,3 +274,8 @@
 
 /* Define to 1 if the X Window System is missing or not being used. */
 /* #undef X_DISPLAY_MISSING */
+
+/* Define socklen_t as it seems to be not defined in default VS setup */
+#ifndef socklen_t
+typedef int socklen_t;
+#endif
\ No newline at end of file
diff --git a/win32/vs6/libgstalpha.dsp b/win32/vs6/libgstalpha.dsp
index 3be9fab9..8e2e5411 100644
--- a/win32/vs6/libgstalpha.dsp
+++ b/win32/vs6/libgstalpha.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release"

+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib libgstvideo-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"

 # Begin Special Build Tool

 TargetPath=.\Release\libgstalpha.dll

 SOURCE="$(InputPath)"

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug"

+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib libgstvideo-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"

 # Begin Special Build Tool

 TargetPath=.\Debug\libgstalpha.dll

 SOURCE="$(InputPath)"

diff --git a/win32/vs6/libgstapetag.dsp b/win32/vs6/libgstapetag.dsp
index c0c09cf8..fe5cdefb 100644
--- a/win32/vs6/libgstapetag.dsp
+++ b/win32/vs6/libgstapetag.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release"

+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgsttag-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"

 # Begin Special Build Tool

 TargetPath=.\Release\libgstapetag.dll

 SOURCE="$(InputPath)"

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug"

+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgsttag-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"

 # Begin Special Build Tool

 TargetPath=.\Debug\libgstapetag.dll

 SOURCE="$(InputPath)"

@@ -106,10 +106,6 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
 

 SOURCE=..\..\gst\apetag\gstapedemux.c

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\gst\apetag\gsttagdemux.c

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -118,10 +114,6 @@ SOURCE=..\..\gst\apetag\gsttagdemux.c
 

 SOURCE=..\..\gst\apetag\gstapedemux.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\..\gst\apetag\gsttagdemux.h

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/win32/vs6/libgstavi.dsp b/win32/vs6/libgstavi.dsp
index bb0720e7..a1ac94e0 100644
--- a/win32/vs6/libgstavi.dsp
+++ b/win32/vs6/libgstavi.dsp
@@ -115,6 +115,10 @@ SOURCE=..\..\gst\avi\gstavidemux.c
 

 SOURCE=..\..\gst\avi\gstavimux.c

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\gst\avi\gstavisubtitle.c

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

diff --git a/win32/vs6/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp
index 86c8075b..1c89fe5d 100644
--- a/win32/vs6/libgstrtp.dsp
+++ b/win32/vs6/libgstrtp.dsp
@@ -220,6 +220,10 @@ SOURCE=..\..\gst\rtp\gstrtpmpvdepay.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\gst\rtp\gstrtpmpvpay.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\gst\rtp\gstrtppcmadepay.c

 # End Source File

 # Begin Source File

diff --git a/win32/vs6/libgstrtsp.dsp b/win32/vs6/libgstrtsp.dsp
index b2a6a850..8bbc3664 100644
--- a/win32/vs6/libgstrtsp.dsp
+++ b/win32/vs6/libgstrtsp.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib glib-2.0.lib gobject-2.0.lib libgstrtsp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"

+# ADD LINK32 glib-2.0.lib gobject-2.0.lib ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"

 # Begin Special Build Tool

 TargetPath=.\Release\libgstrtsp.dll

 SOURCE="$(InputPath)"

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib glib-2.0D.lib gobject-2.0D.lib libgstrtsp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"

+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib ws2_32.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"

 # Begin Special Build Tool

 TargetPath=.\Debug\libgstrtsp.dll

 SOURCE="$(InputPath)"

diff --git a/win32/vs6/libgstvideomixer.dsp b/win32/vs6/libgstvideomixer.dsp
index b6e45917..5fb21180 100644
--- a/win32/vs6/libgstvideomixer.dsp
+++ b/win32/vs6/libgstvideomixer.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"

+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"

 # Begin Special Build Tool

 TargetPath=.\Release\libgstvideomixer.dll

 SOURCE="$(InputPath)"

@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"

+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstcontroller-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug"

 # Begin Special Build Tool

 TargetPath=.\Debug\libgstvideomixer.dll

 SOURCE="$(InputPath)"