Changeset 5cfee5890e9e555105e4dcaae36980ef87943aac

Show
Ignore:
Timestamp:
02/06/02 17:51:30 (6 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1023033090 +0000
git-parent:

[f8570a695a92e33309f238df9eec1044651f63e6]

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

* ./include/vlc_common.h: got rid of i_thread in VLC_COMMON_MEMBERS.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_common.h

    r9d64d52 r5cfee58  
    44 ***************************************************************************** 
    55 * Copyright (C) 1998, 1999, 2000 VideoLAN 
    6  * $Id: vlc_common.h,v 1.4 2002/06/02 13:38:03 gbazin Exp $ 
     6 * $Id: vlc_common.h,v 1.5 2002/06/02 15:51:30 gbazin Exp $ 
    77 * 
    88 * Authors: Samuel Hocevar <sam@via.ecp.fr> 
    …… 
    221221    /* Thread properties, if any */                                         \ 
    222222    vlc_bool_t   b_thread;                                                  \ 
    223     int          i_thread;                                                  \ 
    224223    vlc_thread_t thread_id;                                                 \ 
    225224    vlc_mutex_t  thread_lock;                                               \ 

  • src/misc/objects.c

    r211d6ba r5cfee58  
    33 ***************************************************************************** 
    44 * Copyright (C) 2002 VideoLAN 
    5  * $Id: objects.c,v 1.4 2002/06/02 09:03:54 sam Exp $ 
     5 * $Id: objects.c,v 1.5 2002/06/02 15:51:30 gbazin Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    485485    if( p_this->b_thread ) 
    486486    { 
    487         snprintf( psz_thread, 20, " (thread %d)", p_this->i_thread ); 
     487        snprintf( psz_thread, 20, " (thread %d)", (int)p_this->thread_id ); 
    488488        psz_thread[19] = '\0'; 
    489489    } 

  • src/misc/threads.c

    r71ec135 r5cfee58  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN 
    5  * $Id: threads.c,v 1.4 2002/06/01 18:04:49 sam Exp $ 
     5 * $Id: threads.c,v 1.5 2002/06/02 15:51:30 gbazin Exp $ 
    66 * 
    77 * Authors: Jean-Marc Dressler <polux@via.ecp.fr> 
    …… 
    405405        unsigned threadID; 
    406406        /* When using the MSVCRT C library you have to use the _beginthreadex 
    407          * function instead of CreateThread, otherwise you'll end up with memory 
    408          * leaks and the signal functions not working */ 
     407         * function instead of CreateThread, otherwise you'll end up with 
     408    * memory leaks and the signal functions not working */ 
    409409        p_this->thread_id = 
    410410                (HANDLE)_beginthreadex( NULL, 0, (PTHREAD_START) func,  
    411411                                        (void *)p_this, 0, &threadID ); 
    412412    } 
    413      
     413 
    414414    i_ret = ( p_this->thread_id ? 0 : 1 ); 
    415415 
    …… 
    445445 
    446446        p_this->b_thread = 1; 
    447         p_this->i_thread = p_this->thread_id;   /* We hope the cast will work */ 
    448447 
    449448        if( b_wait )