* ./modules/audio_output/oss.c: compilation fixes.

[vlc] / include / modules_inner.h

diff --git a/include/modules_inner.h b/include/modules_inner.h
index 85770d2ba06996a920a5c0a5c79cd107067e18de..40e17703573fc27a703d9537d64f9dec0c973abc 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -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.28 2002/08/08 00:35:10 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -55,13 +55,13 @@
 #if defined( __BUILTIN__ )
 #   define E_( function )          CONCATENATE( function, MODULE_NAME )
 #   define __VLC_SYMBOL( symbol )  CONCATENATE( symbol, MODULE_NAME )
-#   define DECLARE_SYMBOLS         ;
-#   define STORE_SYMBOLS           ;
+#   define DECLARE_SYMBOLS         struct _u_n_u_s_e_d_
+#   define STORE_SYMBOLS           struct _u_n_u_s_e_d_
 #elif defined( __PLUGIN__ )
 #   define E_( function )          function
 #   define __VLC_SYMBOL( symbol  ) CONCATENATE( symbol, MODULE_SYMBOL )
-#   define DECLARE_SYMBOLS         module_symbols_t* p_symbols;
-#   define STORE_SYMBOLS           p_symbols = p_module->p_symbols;
+#   define DECLARE_SYMBOLS         module_symbols_t* p_symbols
+#   define STORE_SYMBOLS           p_symbols = p_module->p_symbols
 #endif
 
 #if defined( __cplusplus )
@@ -117,7 +117,8 @@
 
 #define add_submodule( )                                                      \
     p_submodule->pp_shortcuts[ i_shortcut ] = NULL;                           \
-    p_submodule = vlc_object_create( p_module, VLC_OBJECT_MODULE );           \
+    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!! */                       \
@@ -133,7 +134,7 @@
     p_submodule->i_cpu = p_module->i_cpu;                                     \
     p_submodule->pf_activate = NULL;                                          \
     p_submodule->pf_deactivate = NULL
-
+    
 #define add_requirement( cap )                                                \
     p_module->i_cpu |= CPU_CAPABILITY_##cap