From: <tho...@fr...> - 2005-10-13 17:52:13
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Thu Oct 13 2005 10:52:03 PDT Log message: add correct header for WIN32 Modified files: gst/elements : gstelements.c gstfilesrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstelements.c.diff?r1=1.68&r2=1.69 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfilesrc.c.diff?r1=1.125&r2=1.126 ====Begin Diffs==== Index: gstelements.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstelements.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- gstelements.c 10 Oct 2005 13:52:18 -0000 1.68 +++ gstelements.c 13 Oct 2005 17:51:51 -0000 1.69 @@ -51,9 +51,9 @@ {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type}, {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type}, {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type}, -#ifndef WIN32 +#ifndef HAVE_WIN32 {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type}, -#endif //WIN32 +#endif {"filesrc", GST_RANK_NONE, gst_file_src_get_type}, {"identity", GST_RANK_NONE, gst_identity_get_type}, {"filesink", GST_RANK_NONE, gst_file_sink_get_type}, Index: gstfilesrc.c RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- gstfilesrc.c 13 Oct 2005 17:43:36 -0000 1.125 +++ gstfilesrc.c 13 Oct 2005 17:51:51 -0000 1.126 @@ -39,12 +39,19 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> + #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #ifdef HAVE_MMAP -#include <sys/mman.h> +# include <sys/mman.h> +#ifdef HAVE_WIN32 +# include <io.h> /* lseek, open, close, read */ #include <errno.h> #include <string.h> @@ -732,7 +739,7 @@ goto could_not_read; /* regular files should have given us what we expected */ - if ((gint) ret < length && src->is_regular) + if ((guint) ret < length && src->is_regular) goto unexpected_eos; /* other files should eos if they read 0 */ |