add correct header for WIN32

Original commit message from CVS:
add correct header for WIN32
This commit is contained in:
Thomas Vander Stichele 2005-10-13 17:51:51 +00:00
parent 2bc75efbf3
commit 82d7d35d64
4 changed files with 24 additions and 10 deletions

View file

@ -51,9 +51,9 @@ static struct _elements_entry _elements[] = {
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type}, {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type}, {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type}, {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
#ifndef WIN32 #ifndef HAVE_WIN32
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type}, {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
#endif //WIN32 #endif
{"filesrc", GST_RANK_NONE, gst_file_src_get_type}, {"filesrc", GST_RANK_NONE, gst_file_src_get_type},
{"identity", GST_RANK_NONE, gst_identity_get_type}, {"identity", GST_RANK_NONE, gst_identity_get_type},
{"filesink", GST_RANK_NONE, gst_file_sink_get_type}, {"filesink", GST_RANK_NONE, gst_file_sink_get_type},

View file

@ -39,12 +39,19 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
#include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#ifdef HAVE_WIN32
# include <io.h> /* lseek, open, close, read */
#endif
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@ -732,7 +739,7 @@ gst_file_src_create_read (GstFileSrc * src, guint64 offset, guint length,
goto could_not_read; goto could_not_read;
/* regular files should have given us what we expected */ /* 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; goto unexpected_eos;
/* other files should eos if they read 0 */ /* other files should eos if they read 0 */

View file

@ -51,9 +51,9 @@ static struct _elements_entry _elements[] = {
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type}, {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type}, {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type}, {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
#ifndef WIN32 #ifndef HAVE_WIN32
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type}, {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
#endif //WIN32 #endif
{"filesrc", GST_RANK_NONE, gst_file_src_get_type}, {"filesrc", GST_RANK_NONE, gst_file_src_get_type},
{"identity", GST_RANK_NONE, gst_identity_get_type}, {"identity", GST_RANK_NONE, gst_identity_get_type},
{"filesink", GST_RANK_NONE, gst_file_sink_get_type}, {"filesink", GST_RANK_NONE, gst_file_sink_get_type},

View file

@ -39,12 +39,19 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> # include <unistd.h>
#endif #endif
#ifdef HAVE_MMAP #ifdef HAVE_MMAP
#include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#ifdef HAVE_WIN32
# include <io.h> /* lseek, open, close, read */
#endif
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
@ -732,7 +739,7 @@ gst_file_src_create_read (GstFileSrc * src, guint64 offset, guint length,
goto could_not_read; goto could_not_read;
/* regular files should have given us what we expected */ /* 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; goto unexpected_eos;
/* other files should eos if they read 0 */ /* other files should eos if they read 0 */