Commit e86ceeef authored by Gildas Bazin's avatar Gildas Bazin

* ALL: WinCE build fixes.

parent 47b183e3
......@@ -90,13 +90,8 @@ struct vlc_t
/* Fast memcpy plugin used */
module_t * p_memcpy_module;
#if defined( UNDER_CE )
void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
void* ( __cdecl *pf_memset ) ( void *, int, size_t );
#else
void* ( *pf_memcpy ) ( void *, const void *, size_t );
void* ( *pf_memset ) ( void *, int, size_t );
#endif
/* Shared data - these structures are accessed directly from p_vlc by
* several modules */
......
......@@ -3,7 +3,7 @@
* This header provides portable declarations for mutexes & conditions
*****************************************************************************
* Copyright (C) 1999, 2002 VideoLAN
* $Id: vlc_threads.h,v 1.37 2004/03/01 12:50:39 gbazin Exp $
* $Id$
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -146,7 +146,7 @@ typedef struct
#elif defined( WIN32 ) || defined( UNDER_CE )
typedef HANDLE vlc_thread_t;
typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
typedef unsigned (__stdcall *PTHREAD_START) (void *);
typedef unsigned (WINAPI *PTHREAD_START) (void *);
typedef struct
{
......
......@@ -47,7 +47,9 @@
# include <sys/stat.h>
#endif
#ifdef WIN32
#if defined( UNDER_CE )
# include <winsock.h>
#elif WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
# ifndef IN_MULTICAST
......
......@@ -38,6 +38,10 @@ int browser_Open( const char *psz_url )
psz_open_commandline = xstrcat( psz_open_commandline, psz_url );
return system( psz_open_commandline );
#elif defined( UNDER_CE )
return -1;
#elif defined( WIN32 )
char *psz_open_commandline;
......@@ -45,6 +49,7 @@ int browser_Open( const char *psz_url )
xstrcat( psz_open_commandline, psz_url );
return system( psz_open_commandline );
#else
/* Assume we're on a UNIX of some sort */
char *psz_open_commandline;
......@@ -55,10 +60,7 @@ int browser_Open( const char *psz_url )
xstrcat( psz_open_commandline, psz_url );
i_ret = system( psz_open_commandline );
if( i_ret == 0 )
{
return 0;
}
if( i_ret == 0 ) return 0;
free( psz_open_commandline );
......
......@@ -31,16 +31,14 @@
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <windows.h>
#define WIN32_LEAN_AND_MEAN
#include <commctrl.h>
#ifdef UNDER_CE
# include <aygshell.h>
# define SHFS_HIDESIPBUTTON 0x0008
# define MENU_HEIGHT 26
#else
# define SHFS_HIDESIPBUTTON 0
# define MENU_HEIGHT 0
# define NM_CUSTOMDRAW 0
#endif
#undef MODULE_NAME_IS_gapi
......
......@@ -299,6 +299,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
for( j = -1; j == -1 || ( j >= 0 && subdirs != NULL && *subdirs != NULL );
j++)
{
#ifdef HAVE_DIRENT_H
d = opendir( j < 0 ? f_dir : *subdirs );
if( d )
{
......@@ -377,6 +378,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
}
closedir( d );
}
#endif
if( j >= 0 ) free( *subdirs++ );
}
......
......@@ -1616,6 +1616,10 @@ char *config_GetHomeDir( void )
#elif defined(UNDER_CE)
#ifndef CSIDL_APPDATA
# define CSIDL_APPDATA 0x1A
#endif
wchar_t p_whomedir[MAX_PATH];
/* get the "Application Data" folder for the current user */
......
......@@ -115,7 +115,7 @@
# include "modules_plugin.h"
#endif
#if defined( UNDER_CE )
#if defined( _MSC_VER ) && defined( UNDER_CE )
# include "modules_builtin_evc.h"
#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
......
......@@ -37,7 +37,7 @@
# include <fcntl.h>
#endif
#include <winsock2.h>
#include <winsock.h>
/*****************************************************************************
* system_Init: initialize winsock and misc other things.
......@@ -77,8 +77,8 @@ void system_Init( vlc_t *p_this, int *pi_argc, char *ppsz_argv[] )
/* Set the default file-translation mode */
#if !defined( UNDER_CE )
_fmode = _O_BINARY;
#endif
_setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
#endif
/* Call mdate() once to make sure it is initialized properly */
mdate();
......
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