* src/video_output/vout_subpictures.c: support for subpictures filters.

[vlc] / include / os_specific.h

diff --git a/include/os_specific.h b/include/os_specific.h
index 6e39125839daf7eb983ac7d19fe8137e9e712c25..87ed1535db5066169049920728bc5ca529a8bfc5 100644 (file)
--- a/include/os_specific.h
+++ b/include/os_specific.h
@@ -2,7 +2,7 @@
  * os_specific.h: OS specific features
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: os_specific.h,v 1.2 2002/04/24 00:36:24 sam Exp $
+ * $Id: os_specific.h,v 1.13 2004/01/25 18:17:08 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -22,39 +22,37 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef SYS_BEOS
-#   include "beos_specific.h"
+#ifndef _NEED_OS_SPECIFIC_H
+#   define _NEED_OS_SPECIFIC_H 1
 #endif
-#ifdef SYS_DARWIN
+
+#if defined( SYS_BEOS )
+#   include "beos_specific.h"
+#elif defined( SYS_DARWIN )
 #   include "darwin_specific.h"
-#endif
-#ifdef WIN32
+#elif defined( WIN32 ) || defined( UNDER_CE )
 #   include "win32_specific.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*****************************************************************************
- * main_sys_t: system specific descriptor
- ****************************************************************************/
-struct main_sys_s;
-
-#ifndef __PLUGIN__
-extern struct main_sys_s *p_main_sys;
 #else
-#   define p_main_sys (p_symbols->p_main_sys)
+#   undef _NEED_OS_SPECIFIC_H
 #endif
 
+#   ifdef __cplusplus
+extern "C" {
+#   endif
 
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-void system_Init ( int *pi_argc, char *ppsz_argv[], char *ppsz_env[] );
-void system_Configure  ( void );
-void system_End  ( void );
+#ifdef _NEED_OS_SPECIFIC_H
+    void system_Init       ( vlc_t *, int *, char *[] );
+    void system_Configure  ( vlc_t *, int *, char *[] );
+    void system_End        ( vlc_t * );
+#else
+#   define system_Init( a, b, c ) {}
+#   define system_Configure( a, b, c ) {}
+#   define system_End( a ) {}
+#endif
 
-#ifdef __cplusplus
+#   ifdef __cplusplus
 }
-#endif
+#   endif