[vlc-devel] Symbian VLC Merge changes to src

[Rémi Denis-Courmont]

diff --git a/src/control/core.c b/src/control/core.c
index 942212d..59d98cd 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -48,14 +48,24 @@ libvlc_instance_t * libvlc_new( int argc, const char 
*const *argv )
     const char *my_argv[argc + 2];
     my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */
     for( int i = 0; i < argc; i++ )
-         my_argv[i + 1] = argv[i];
+
+#ifndef __WINSCW__
+    my_argv[i + 1] = argv[i];
+#else
+    my_argv[i + 1] = (char *) argv[i];
+#endif
+

I still don't understand why you need that cast.

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 3ac19d5..054abd0 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -55,7 +55,7 @@
  *****************************************************************************/
 
 /* XXX attribute_packed is (and MUST be) used ONLY to reduce memory usage */
-#ifdef HAVE_ATTRIBUTE_PACKED
+#if defined(HAVE_ATTRIBUTE_PACKED) && !defined(__WINSCW__)

This is counter-sensical. If you don't have attribute packed, then you don't 
have attribute packed.

diff --git a/src/misc/block.c b/src/misc/block.c
index 7649d7a..26f3285 100644
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -439,6 +439,7 @@ block_t *block_File (int fd)
     }
 #endif
 
+#ifndef SYMBIAN
     /* If mmap() is not implemented by the OS _or_ the filesystem... */
     block_t *block = block_Alloc (length);
     if (block == NULL)
@@ -458,6 +459,7 @@ block_t *block_File (int fd)
     }
     vlc_cleanup_pop ();
     return block;
+#endif

This seems silly.

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 063ae60..23b3435 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -511,6 +511,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * 
p_item )
     msg_bank_t *bank = priv->msg_bank;
     int i_type = p_item->i_type;
 
+#ifndef SYMBIAN
     switch( i_type )
     {
         case VLC_MSG_ERR:
@@ -526,6 +527,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * 
p_item )
             if( priv->i_verbose < 2 ) return;
             break;
     }
+#endif

This too.
 
-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis