Default to rebase on submodule updates to prevent losing local changes.

[vlc] / src / missing.c

diff --git a/src/missing.c b/src/missing.c
index a47920adbb2dd72cd19c78aa9840d1ae0545beed..b96f911b7d2cf66e1247d50fc37cedb6e1bcc969 100644 (file)
--- a/src/missing.c
+++ b/src/missing.c
@@ -344,40 +344,52 @@ char *vlc_sdp_Start (vlc_object_t *obj, const char *cfg,
 
 int vlm_Control (vlm_t *vlm, int query, ...)
 {
+    VLC_UNUSED (vlm);
     assert (0);
 }
 
 void vlm_Delete (vlm_t *vlm)
 {
+    VLC_UNUSED (vlm);
     assert (0);
 }
 
 int vlm_ExecuteCommand (vlm_t *vlm, const char *cmd, vlm_message_t **pm)
 {
+    VLC_UNUSED (vlm);
+    VLC_UNUSED (cmd);
+    VLC_UNUSED (pm);
     assert (0);
 }
 
 vlm_message_t *vlm_MessageAdd (vlm_message_t *a, vlm_message_t *b)
 {
+    VLC_UNUSED (a);
+    VLC_UNUSED (b);
     assert (0);
 }
 
 void vlm_MessageDelete (vlm_message_t *m)
 {
+    VLC_UNUSED (m);
     assert (0);
 }
 
 vlm_message_t *vlm_MessageSimpleNew (const char *a)
 {
+    VLC_UNUSED (a);
     return NULL;
 }
 
 vlm_message_t *vlm_MessageNew (const char *a, const char *fmt, ...)
 {
+    VLC_UNUSED (a);
+    VLC_UNUSED (fmt);
     return vlm_MessageSimpleNew (a);
 }
 
-vlm_t *__vlm_New (vlc_object_t *obj)
+#undef vlm_New
+vlm_t *vlm_New (vlc_object_t *obj)
 {
      msg_Err (obj, "VLM not compiled-in!");
      return NULL;