diff options
| author | Tim Champagne <tchamp@users.sourceforge.net> | 2003-05-16 15:07:35 +0000 |
|---|---|---|
| committer | Tim Champagne <tchamp@users.sourceforge.net> | 2003-05-16 15:07:35 +0000 |
| commit | 19b954f40ce05dbb781810206de6ca38fa47eb76 (patch) | |
| tree | b6be89f7b8a9acc651a5f4edcb07ce7631bdcc99 /src | |
| parent | 02d7b2575a8672138dd4f088bd829f5ae7383310 (diff) | |
| download | xine-lib-19b954f40ce05dbb781810206de6ca38fa47eb76.tar.gz xine-lib-19b954f40ce05dbb781810206de6ca38fa47eb76.tar.bz2 | |
Fix win32 build and start adding additional plugin support
CVS patchset: 4867
CVS date: 2003/05/16 15:07:35
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_cdda.c | 9 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/broadcaster.c | 9 |
3 files changed, 21 insertions, 7 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index b5f385f94..5e2573fe3 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -20,7 +20,7 @@ * Compact Disc Digital Audio (CDDA) Input Plugin * by Mike Melanson (melanson@pcisys.net) * - * $Id: input_cdda.c,v 1.20 2003/05/06 20:31:42 miguelfreitas Exp $ + * $Id: input_cdda.c,v 1.21 2003/05/16 15:07:35 tchamp Exp $ */ #ifdef HAVE_CONFIG_H @@ -30,13 +30,18 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <sys/ioctl.h> + #include <sys/types.h> #include <dirent.h> #include <sys/stat.h> #include <fcntl.h> #include <errno.h> + +#ifndef _MSC_VER +#include <sys/ioctl.h> #include <netdb.h> +#endif /* _MSC_VER */ + #include <signal.h> #include <netinet/in.h> #include <sys/socket.h> diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 370db25a0..d23301aca 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.162 2003/05/14 16:47:20 mroi Exp $ + * $Id: input_dvd.c,v 1.163 2003/05/16 15:07:36 tchamp Exp $ * */ @@ -42,11 +42,12 @@ #include <stddef.h> #ifndef _MSC_VER -#include <dirent.h> #include <sys/param.h> +#endif /* _MSC_VER */ + #include <sys/types.h> #include <sys/stat.h> -#endif /* _MSC_VER */ +#include <dirent.h> #include <unistd.h> #include <fcntl.h> @@ -1628,6 +1629,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.163 2003/05/16 15:07:36 tchamp + * Fix win32 build and start adding additional plugin support + * * Revision 1.162 2003/05/14 16:47:20 mroi * just to play it safe * diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 271149539..0dc0c46e6 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: broadcaster.c,v 1.1 2003/05/15 20:23:18 miguelfreitas Exp $ + * $Id: broadcaster.c,v 1.2 2003/05/16 15:07:37 tchamp Exp $ * * broadcaster.c - xine network broadcaster * @@ -38,7 +38,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <sys/ioctl.h> + #include <sys/stat.h> #include <sys/types.h> #include <fcntl.h> @@ -50,8 +50,13 @@ #include <sys/time.h> #include <sys/socket.h> #include <netinet/in.h> + +#ifndef _MSC_VER +#include <sys/ioctl.h> #include <arpa/inet.h> #include <netdb.h> +#endif /* _MSC_VER */ + #include <dlfcn.h> #include <pthread.h> |