Changeset e86ceeef98feb5eb5dbf2f8e7d3551f6276713ed

Show
Ignore:
Timestamp:
15/02/05 22:21:17 (4 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1108502477 +0000
git-parent:

[47b183e33e4eceaae58ef665110da9ec15d3ed32]

git-author:
Gildas Bazin <gbazin@videolan.org> 1108502477 +0000
Message:

* ALL: WinCE build fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/main.h

    r16b99ba re86ceee  
    9191    /* Fast memcpy plugin used */ 
    9292    module_t *             p_memcpy_module; 
    93 #if defined( UNDER_CE ) 
    94     void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t ); 
    95     void* ( __cdecl *pf_memset ) ( void *, int, size_t ); 
    96 #else 
    9793    void* ( *pf_memcpy ) ( void *, const void *, size_t ); 
    9894    void* ( *pf_memset ) ( void *, int, size_t ); 
    99 #endif 
    10095 
    10196    /* Shared data - these structures are accessed directly from p_vlc by 

  • include/vlc_threads.h

    r4598fd2 re86ceee  
    44 ***************************************************************************** 
    55 * Copyright (C) 1999, 2002 VideoLAN 
    6  * $Id: vlc_threads.h,v 1.37 2004/03/01 12:50:39 gbazin Exp $ 
     6 * $Id$ 
    77 * 
    88 * Authors: Jean-Marc Dressler <polux@via.ecp.fr> 
    …… 
    147147typedef HANDLE vlc_thread_t; 
    148148typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL ); 
    149 typedef unsigned (__stdcall *PTHREAD_START) (void *); 
     149typedef unsigned (WINAPI *PTHREAD_START) (void *); 
    150150 
    151151typedef struct 

  • modules/access/mms/mmstu.c

    r0dd3733 re86ceee  
    4848#endif 
    4949 
    50 #ifdef WIN32 
     50#if defined( UNDER_CE ) 
     51#   include <winsock.h> 
     52#elif WIN32 
    5153#   include <winsock2.h> 
    5254#   include <ws2tcpip.h> 

  • modules/codec/cmml/browser_open.c

    rd8da383 re86ceee  
    3939 
    4040    return system( psz_open_commandline ); 
     41 
     42#elif defined( UNDER_CE ) 
     43    return -1; 
     44 
    4145#elif defined( WIN32 ) 
    4246    char *psz_open_commandline; 
    …… 
    4650 
    4751    return system( psz_open_commandline ); 
     52 
    4853#else 
    4954    /* Assume we're on a UNIX of some sort */ 
    …… 
    5661    i_ret = system( psz_open_commandline ); 
    5762 
    58     if( i_ret == 0 ) 
    59     { 
    60         return 0; 
    61     } 
     63    if( i_ret == 0 ) return 0; 
    6264 
    6365    free( psz_open_commandline ); 

  • modules/video_output/wingdi.c

    rc959f01 re86ceee  
    3232#include <vlc/vout.h> 
    3333 
    34 #include <windows.h> 
    35 #define WIN32_LEAN_AND_MEAN 
     34#include <commctrl.h> 
    3635 
    3736#ifdef UNDER_CE 
    38 #   include <aygshell.h> 
     37#   define SHFS_HIDESIPBUTTON   0x0008 
    3938#   define MENU_HEIGHT 26 
    4039#else 
    4140#   define SHFS_HIDESIPBUTTON 0 
    4241#   define MENU_HEIGHT 0 
    43 #   define NM_CUSTOMDRAW 0 
    4442#endif 
    4543 

  • src/input/subtitles.c

    r8a53024 re86ceee  
    300300         j++) 
    301301    { 
     302#ifdef HAVE_DIRENT_H 
    302303        d = opendir( j < 0 ? f_dir : *subdirs ); 
    303304        if( d ) 
    …… 
    378379            closedir( d ); 
    379380        } 
     381#endif 
    380382        if( j >= 0 ) free( *subdirs++ ); 
    381383    } 

  • src/misc/configuration.c

    r31ca77e re86ceee  
    16171617#elif defined(UNDER_CE) 
    16181618 
     1619#ifndef CSIDL_APPDATA 
     1620#   define CSIDL_APPDATA 0x1A 
     1621#endif 
     1622 
    16191623    wchar_t p_whomedir[MAX_PATH]; 
    16201624 

  • src/misc/modules.c

    r0a5efa3 re86ceee  
    116116#endif 
    117117 
    118 #if defined( UNDER_CE ) 
     118#if defined( _MSC_VER ) && defined( UNDER_CE ) 
    119119#    include "modules_builtin_evc.h" 
    120120#elif defined( _MSC_VER ) 

  • src/misc/win32_specific.c

    rc2779ed re86ceee  
    3838#endif 
    3939 
    40 #include <winsock2.h> 
     40#include <winsock.h> 
    4141 
    4242/***************************************************************************** 
    …… 
    7878#if !defined( UNDER_CE ) 
    7979    _fmode = _O_BINARY; 
    80 #endif 
    8180    _setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */ 
     81#endif 
    8282 
    8383    /* Call mdate() once to make sure it is initialized properly */