Fix a few warnings

[vlc] / include / vlc_stream.h

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index e81a1cd4626bbdf16cd318bb300a443000d8a137..0de036c1088aeaa126e9c4257c30f26ac9911b47 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_stream.h
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -24,6 +24,10 @@
 #ifndef _VLC_STREAM_H
 #define _VLC_STREAM_H 1
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
 /**
  * \defgroup stream Stream
  *
@@ -50,8 +54,8 @@ enum stream_query_e
 
     /* Special for direct access control from demuxer.
      * XXX: avoid using it by all means */
-    STREAM_CONTROL_ACCESS,      /* arg1= int i_access_query, args   res: can fail
-                                   if access unreachable or access control answer */
+    STREAM_CONTROL_ACCESS   /* arg1= int i_access_query, args   res: can fail
+                             if access unreachable or access control answer */
 };
 
 /**
@@ -199,10 +203,14 @@ VLC_EXPORT( void,      stream_DemuxDelete,( stream_t *s ) );
 #define stream_MemoryNew( a, b, c, d ) __stream_MemoryNew( VLC_OBJECT(a), b, c, d )
 VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, vlc_bool_t i_preserve_memory ) );
 #define stream_UrlNew( a, b ) __stream_UrlNew( VLC_OBJECT(a), b )
-VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, char *psz_url ) );
+VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) );
 
 /**
  * @}
  */
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif