Commit 7211d64e authored by gbazin's avatar gbazin
Browse files

* ALL: Finally fixed the MSVC project files.
       Don't include io.h on win32 when not necessary.
       A few build fixes for MSVC.

* src/misc/win32_specific.c: try to load winsock2 instead of winsock1 when
   present.
parent 25a00dad
......@@ -2,7 +2,7 @@
* ifo.c: Functions for ifo parsing
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ifo.c,v 1.4 2003/01/16 23:00:47 massiot Exp $
* $Id: ifo.c,v 1.5 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* German Tischler <tanis@gaspode.franken.de>
......@@ -37,8 +37,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 )
# include <io.h>
#endif
#include <string.h>
......
......@@ -5,7 +5,7 @@
* contains the basic udf handling functions
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: udf.c,v 1.4 2002/12/06 16:34:04 sam Exp $
* $Id: udf.c,v 1.5 2003/03/03 14:21:08 gbazin Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -39,8 +39,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 )
# include <io.h>
#endif
#ifdef STRNCASECMP_IN_STRINGS_H
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.11 2003/02/20 01:52:45 sigmunau Exp $
* $Id: file.c,v 1.12 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -44,7 +44,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
......
......@@ -2,7 +2,7 @@
* ftp.c:
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ftp.c,v 1.8 2003/02/20 01:52:45 sigmunau Exp $
* $Id: ftp.c,v 1.9 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -41,8 +41,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 )
# include <io.h>
#endif
#ifdef WIN32
......
......@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.24 2003/02/20 01:52:45 sigmunau Exp $
* $Id: http.c,v 1.25 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -26,7 +26,6 @@
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
......@@ -43,8 +42,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#if defined( UNDER_CE )
......
......@@ -2,7 +2,7 @@
* mms.c: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.c,v 1.21 2003/03/03 01:38:07 fenrir Exp $
* $Id: mms.c,v 1.22 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -45,8 +45,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 )
# include <io.h>
#endif
#ifdef WIN32
......
......@@ -2,7 +2,7 @@
* udp.c: raw UDP & RTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.14 2003/02/20 01:52:45 sigmunau Exp $
* $Id: udp.c,v 1.15 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Tristan Leteurtre <tooney@via.ecp.fr>
......@@ -26,7 +26,6 @@
* Preamble
*****************************************************************************/
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
......@@ -42,8 +41,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 )
# include <io.h>
#endif
#ifdef WIN32
......
......@@ -2,7 +2,7 @@
* dummy.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: dummy.c,v 1.2 2003/02/16 14:10:44 fenrir Exp $
* $Id: dummy.c,v 1.3 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -38,8 +38,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
/*****************************************************************************
......
......@@ -2,7 +2,7 @@
* file.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.3 2003/02/16 14:10:44 fenrir Exp $
* $Id: file.c,v 1.4 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -38,7 +38,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
#elif defined( WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
......
......@@ -2,7 +2,7 @@
* udp.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.4 2003/02/16 14:51:23 fenrir Exp $
* $Id: udp.c,v 1.5 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -38,8 +38,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#ifdef WIN32
......
......@@ -2,7 +2,7 @@
* directx.c: Windows DirectX audio output method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: directx.c,v 1.14 2003/02/20 16:07:38 gbazin Exp $
* $Id: directx.c,v 1.15 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -90,6 +90,25 @@ DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0,
# define SPEAKER_RESERVED 0x80000000
#endif
#ifndef DSSPEAKER_HEADPHONE
# define DSSPEAKER_HEADPHONE 0x00000001
#endif
#ifndef DSSPEAKER_MONO
# define DSSPEAKER_MONO 0x00000002
#endif
#ifndef DSSPEAKER_QUAD
# define DSSPEAKER_QUAD 0x00000003
#endif
#ifndef DSSPEAKER_STEREO
# define DSSPEAKER_STEREO 0x00000004
#endif
#ifndef DSSPEAKER_SURROUND
# define DSSPEAKER_SURROUND 0x00000005
#endif
#ifndef DSSPEAKER_5POINT1
# define DSSPEAKER_5POINT1 0x00000006
#endif
#ifndef _WAVEFORMATEXTENSIBLE_
typedef struct {
WAVEFORMATEX Format;
......
......@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: rc.c,v 1.28 2003/02/20 16:07:38 gbazin Exp $
* $Id: rc.c,v 1.29 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
......@@ -140,15 +140,15 @@ static void Run( intf_thread_t *p_intf )
double f_ratio = 1.0;
p_input = NULL;
p_playlist = NULL;
#ifdef WIN32
HANDLE hConsoleIn;
INPUT_RECORD input_record;
DWORD i_dummy2;
#endif
p_input = NULL;
p_playlist = NULL;
/* Register commands that will be cleaned up upon object destruction */
var_Create( p_intf, "quit", VLC_VAR_VOID | VLC_VAR_ISCOMMAND );
var_AddCallback( p_intf, "quit", Quit, NULL );
......
......@@ -2,7 +2,7 @@
* httpd.c
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: httpd.c,v 1.5 2003/03/02 17:12:21 fenrir Exp $
* $Id: httpd.c,v 1.6 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -26,7 +26,6 @@
*****************************************************************************/
#include <stdlib.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -37,10 +36,12 @@
#include <vlc/vlc.h>
#include "httpd.h"
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#if defined( UNDER_CE )
......
......@@ -2,7 +2,7 @@
* ipv4.c: IPv4 network abstraction layer
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ipv4.c,v 1.14 2003/02/18 18:33:44 titer Exp $
* $Id: ipv4.c,v 1.15 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com>
......@@ -44,8 +44,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#if defined( UNDER_CE )
......
......@@ -2,7 +2,7 @@
* avi.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: avi.c,v 1.8 2003/02/24 14:14:43 fenrir Exp $
* $Id: avi.c,v 1.9 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -39,8 +39,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "codecs.h"
......
......@@ -2,7 +2,7 @@
* dummy.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: dummy.c,v 1.5 2003/02/24 14:14:43 fenrir Exp $
* $Id: dummy.c,v 1.6 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -38,8 +38,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "codecs.h"
......
......@@ -2,7 +2,7 @@
* pes.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: pes.c,v 1.4 2003/01/17 15:26:24 fenrir Exp $
* $Id: pes.c,v 1.5 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -38,8 +38,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "codecs.h"
......
......@@ -2,7 +2,7 @@
* ps.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ps.c,v 1.9 2003/02/24 14:14:43 fenrir Exp $
* $Id: ps.c,v 1.10 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -39,8 +39,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "codecs.h"
......
......@@ -2,7 +2,7 @@
* ts.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ts.c,v 1.13 2003/02/26 12:38:17 fenrir Exp $
* $Id: ts.c,v 1.14 2003/03/03 14:21:08 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
......@@ -39,8 +39,6 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
# include <io.h>
#endif
#include "codecs.h"
......
......@@ -30,7 +30,7 @@
/* #undef C_ALLOCA */
/* Define if <X11/extensions/dpms.h> defines DPMSInfo. */
#define DPMSINFO_IN_DPMS_H 1
/* #undef DPMSINFO_IN_DPMS_H */
/* Define to 1 if translation of program messages to the user's native
language is requested. */
......@@ -40,7 +40,7 @@
/* #undef HAVE_A52DEC_A52_H */
/* Define to 1 if you have `alloca', as a function or macro. */
/* #define HAVE_ALLOCA 1 */
#define HAVE_ALLOCA 1
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
......@@ -254,7 +254,7 @@
/* #undef HAVE_POSIX_MEMALIGN */
/* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H 1
/* #undef HAVE_PTHREAD_H */
/* Define to 1 if you have the `putenv' function. */
#define HAVE_PUTENV 1
......@@ -395,7 +395,7 @@
/* #undef HAVE_XVID_H */
/* Define to 1 if you have the <zlib.h> header file. */
#define HAVE_ZLIB_H 1
/* #undefine HAVE_ZLIB_H */
/* Define to 1 if you have the `__argz_count' function. */
/* #undef HAVE___ARGZ_COUNT */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment