Changeset 0a5efa39e8f52fe8ac98bc74373e9ea625729225

Show
Ignore:
Timestamp:
05/01/05 23:45:36 (4 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1104965136 +0000
git-parent:

[14410c4779cfb0da21e7a7a6b1ec2a3ad14884c2]

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

* src/misc/modules.c,cpu.c, modules/access/file.c: WinCE fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/file.c

    rd5eacbe r0a5efa3  
    186186    p_sys->i_file = 0; 
    187187    p_sys->i_index = 0; 
     188#ifndef UNDER_CE 
    188189    p_sys->fd = -1; 
     190#endif 
    189191 
    190192    if( !strcasecmp( p_access->psz_access, "stream" ) ) 
    …… 
    578580    if ( !p_sys->fd ) 
    579581    { 
    580         msg_Err( p_access, "cannot open file %s" ); 
     582        msg_Err( p_access, "cannot open file %s", psz_name ); 
    581583        return VLC_EGENERIC; 
    582584    } 

  • src/misc/cpu.c

    rae7ce94 r0a5efa3  
    284284    return i_capabilities; 
    285285 
    286 #elif defined( _MSC_VER ) 
     286#elif defined( _MSC_VER ) && !defined( UNDER_CE ) 
    287287    i_capabilities |= CPU_CAPABILITY_FPU; 
    288288    return i_capabilities; 

  • src/misc/modules.c

    r43e9431 r0a5efa3  
    15451545{ 
    15461546#if defined(UNDER_CE) 
    1547     wchar_t psz_tmp[256]; 
    1548     char * psz_buffer = malloc( 256 ); 
     1547    wchar_t psz_tmp[MAX_PATH]; 
     1548    char * psz_buffer = malloc( MAX_PATH ); 
    15491549#else 
    1550     char * psz_tmp = malloc( 256 ); 
     1550    char * psz_tmp = malloc( MAX_PATH ); 
    15511551#endif 
    15521552    int i = 0, i_error = GetLastError(); 
    …… 
    15541554    FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 
    15551555                   NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), 
    1556                    (LPTSTR) psz_tmp, 256, NULL ); 
     1556                   (LPTSTR)psz_tmp, MAX_PATH, NULL ); 
    15571557 
    15581558    /* Go to the end of the string */ 
    1559 #if defined(UNDER_CE) 
    1560     while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' ) 
    1561 #else 
    1562     while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' ) 
    1563 #endif 
     1559    while( psz_tmp[i] && psz_tmp[i] != _T('\r') && psz_tmp[i] != _T('\n') ) 
    15641560    { 
    15651561        i++; 
    …… 
    15781574 
    15791575#if defined(UNDER_CE) 
    1580     WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1, 
    1581                          psz_buffer, 256, NULL, NULL ); 
     1576    wcstombs( psz_buffer, psz_tmp, MAX_PATH ); 
    15821577    return psz_buffer; 
    15831578#else