Handle VOC files with multiple blocks properly

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index e57e4d7728f02556bbf740dbcab188c61722b805..12c216b7ff597a7bdd91dc188d30a0a9e0715559 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -3,7 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: main.h,v 1.57 2004/01/25 18:17:08 zorglub Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -55,6 +55,9 @@ struct libvlc_t
     module_bank_t *        p_module_bank;
 
     /* Arch-specific variables */
+#if !defined( WIN32 )
+    vlc_bool_t             b_daemon;
+#endif 
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
     char *                 psz_vlcpath;
@@ -65,6 +68,8 @@ struct libvlc_t
     vlc_bool_t             b_fast_mutex;
     int                    i_win9x_cv;
     char *                 psz_vlcpath;
+#elif defined( UNDER_CE )
+    char *                 psz_vlcpath;
 #endif
 };
 
@@ -85,13 +90,8 @@ struct vlc_t
 
     /* Fast memcpy plugin used */
     module_t *             p_memcpy_module;
-#if defined( UNDER_CE )
-    void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
-    void* ( __cdecl *pf_memset ) ( void *, int, size_t );
-#else
     void* ( *pf_memcpy ) ( void *, const void *, size_t );
     void* ( *pf_memset ) ( void *, int, size_t );
-#endif
 
     /* Shared data - these structures are accessed directly from p_vlc by
      * several modules */