Skip to content

V
vlc-2-2
Commit 2bc88e46 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

Cosmetic fixes.

parent 1538dd9e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
Makefile
View file @ 2bc88e46
...@@ -474,7 +474,7 @@ gnome-vlc gvlc kvlc qvlc: vlc ...@@ -474,7 +474,7 @@ gnome-vlc gvlc kvlc qvlc: vlc
vlc.app: vlc plugins vlc.app: vlc plugins
ifneq (,$(findstring darwin,$(SYS))) ifneq (,$(findstring darwin,$(SYS)))
rm -Rf vlc.app rm -Rf vlc.app
cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' | grep -v "^$$"
cp -r extras/MacOSX/build/vlc.bundle ./vlc.app cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
$(INSTALL) -d vlc.app/Contents/MacOS/share $(INSTALL) -d vlc.app/Contents/MacOS/share
$(INSTALL) -d vlc.app/Contents/MacOS/plugins $(INSTALL) -d vlc.app/Contents/MacOS/plugins
......
include/threads_funcs.h
View file @ 2bc88e46
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* This header provides a portable threads implementation. * This header provides a portable threads implementation.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: threads_funcs.h,v 1.1 2002/04/27 22:11:22 gbazin Exp $ * $Id: threads_funcs.h,v 1.2 2002/04/29 23:57:38 massiot Exp $
* *
* Authors: Jean-Marc Dressler <polux@via.ecp.fr> * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -704,13 +704,8 @@ static __inline__ int _vlc_cond_destroy( char * psz_file, int i_line, ...@@ -704,13 +704,8 @@ static __inline__ int _vlc_cond_destroy( char * psz_file, int i_line,
/***************************************************************************** /*****************************************************************************
* vlc_thread_create: create a thread * vlc_thread_create: create a thread
*****************************************************************************/ *****************************************************************************/
#ifdef DEBUG #define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
# define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
_vlc_thread_create( __FILE__, __LINE__, P_THREAD, PSZ_NAME, FUNC, P_DATA ) _vlc_thread_create( __FILE__, __LINE__, P_THREAD, PSZ_NAME, FUNC, P_DATA )
#else
# define vlc_thread_create( P_THREAD, PSZ_NAME, FUNC, P_DATA ) \
_vlc_thread_create( "(unknown)", 0, P_THREAD, PSZ_NAME, FUNC, P_DATA )
#endif
static __inline__ int _vlc_thread_create( char * psz_file, int i_line, static __inline__ int _vlc_thread_create( char * psz_file, int i_line,
vlc_thread_t *p_thread, vlc_thread_t *p_thread,
......
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