* include/vlc_common.h:

    + Added proper const keywords.
  * modules/demux/mp4/drms.c:
    + Minor coding style fix.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 24b7783ead66f83878681928e211992d17270719..f698cad2a9e948f2e03bc21c49e5a3816a5a6fcf 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.102 2004/01/11 00:45:06 zorglub Exp $
+ * $Id: vlc_common.h,v 1.103 2004/01/20 17:44:30 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -502,18 +502,18 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
  * MSB, and should be used for both network communications and files. Note that
  * byte orders other than little and big endians are not supported, but only
  * the VAX seems to have such exotic properties. */
-static inline uint16_t U16_AT( void * _p )
+static inline uint16_t U16_AT( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint16_t)p[0] << 8) | p[1] );
 }
-static inline uint32_t U32_AT( void * _p )
+static inline uint32_t U32_AT( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
               | ((uint32_t)p[2] << 8) | p[3] );
 }
-static inline uint64_t U64_AT( void * _p )
+static inline uint64_t U64_AT( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48)
@@ -522,18 +522,18 @@ static inline uint64_t U64_AT( void * _p )
               | ((uint64_t)p[6] << 8) | p[7] );
 }
 
-static inline uint16_t GetWLE( void * _p )
+static inline uint16_t GetWLE( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint16_t)p[1] << 8) | p[0] );
 }
-static inline uint32_t GetDWLE( void * _p )
+static inline uint32_t GetDWLE( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint32_t)p[3] << 24) | ((uint32_t)p[2] << 16)
               | ((uint32_t)p[1] << 8) | p[0] );
 }
-static inline uint64_t GetQWLE( void * _p )
+static inline uint64_t GetQWLE( void const * _p )
 {
     uint8_t * p = (uint8_t *)_p;
     return ( ((uint64_t)p[7] << 56) | ((uint64_t)p[6] << 48)

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index aa9052577cd00a8929ce2d4f5b3fdd11be1c1c47..d15a1174e5f497d83fd05e8ba018ea8ca74c3b21 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -2,7 +2,7 @@
  * drms.c: DRMS
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: drms.c,v 1.8 2004/01/19 16:40:28 jlj Exp $
+ * $Id: drms.c,v 1.9 2004/01/20 17:44:30 sam Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Sam Hocevar <sam@zoy.org>
@@ -43,15 +43,15 @@
 #endif
 
 #ifdef HAVE_SYS_STAT_H
-   #include <sys/stat.h>
+#   include <sys/stat.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
-   #include <sys/types.h>
+#   include <sys/types.h>
 #endif
 
 /* In Solaris (and perhaps others) PATH_MAX is in limits.h. */
 #ifdef HAVE_LIMITS_H
-   #include <limits.h>
+#   include <limits.h>
 #endif
 
 #include "drms.h"