Commit bbe70b81 authored by Tony Castley's avatar Tony Castley
Browse files

Compilation fixes for C++ environments like BeOS.

parent 1f327d87
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.25 2002/07/31 22:54:21 sam Exp $
* $Id: modules_inner.h,v 1.26 2002/08/01 11:04:46 tcastley Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -116,24 +116,24 @@
#define add_submodule( ) \
p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \
p_submodule = vlc_object_create( p_module, VLC_OBJECT_MODULE ); \
p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \
p_submodule = (module_t *)vlc_object_create( p_module, VLC_OBJECT_MODULE );\
vlc_object_attach( p_submodule, p_module ); \
p_submodule->b_submodule = VLC_TRUE; \
/* Nuahahaha! Heritage! Polymorphism! Ugliness!! */ \
for( i_shortcut = 0; p_module->pp_shortcuts[ i_shortcut ]; i_shortcut++ ) \
{ \
p_submodule->pp_shortcuts[ i_shortcut ] = \
p_module->pp_shortcuts[ i_shortcut ]; \
p_module->pp_shortcuts[ i_shortcut ]; \
} \
p_submodule->psz_object_name = p_module->psz_object_name; \
p_submodule->psz_program = p_module->psz_program; \
p_submodule->psz_capability = p_module->psz_capability; \
p_submodule->i_score = p_module->i_score; \
p_submodule->i_cpu = p_module->i_cpu; \
p_submodule->pf_activate = NULL; \
p_submodule->pf_activate = NULL; \
p_submodule->pf_deactivate = NULL
#define add_requirement( cap ) \
p_module->i_cpu |= CPU_CAPABILITY_##cap
......
......@@ -2,7 +2,7 @@
* memcpy.c : classic memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: memcpy.c,v 1.10 2002/07/31 20:56:52 sam Exp $
* $Id: memcpy.c,v 1.11 2002/08/01 11:04:46 tcastley Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -68,7 +68,7 @@ static int Activate ( vlc_object_t *p_this )
#ifdef MODULE_NAME_IS_memcpy
p_this->p_vlc->pf_memcpy = memcpy;
#else
p_this->p_vlc->pf_memcpy = E_(fast_memcpy);
p_this->p_vlc->pf_memcpy = fast_memcpy;
#endif
return VLC_SUCCESS;
......
Supports Markdown
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