From: Jean-Paul Saman <jpsaman@videolan.org>
Date: Sat, 8 Dec 2007 00:04:26 +0000 (+0000)
Subject: Guard headerfiles in modules/access/mms/*.h against multiple inclusions.
X-Git-Tag: 0.9.0-test0~4243
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=29ec30426b628114c1be5c99c1ee95330614f9aa;p=vlc

Guard headerfiles in modules/access/mms/*.h against multiple inclusions.
---

diff --git a/modules/access/mms/asf.h b/modules/access/mms/asf.h
index 57c7513d75..9411accd5c 100644
--- a/modules/access/mms/asf.h
+++ b/modules/access/mms/asf.h
@@ -28,6 +28,9 @@
  *
  ****************************************************************************/
 
+#ifndef _ASF_H_
+#define _ASF_H_ 1
+
 #define ASF_STREAM_VIDEO    0x0001
 #define ASF_STREAM_AUDIO    0x0002
 #define ASF_STREAM_UNKNOWN  0xffff
@@ -49,7 +52,6 @@ typedef struct
 
 } asf_header_t;
 
-
 typedef struct guid_s
 {
     uint32_t v1; /* le */
@@ -65,7 +67,6 @@ void E_( asf_StreamSelect ) ( asf_header_t *,
                               int i_bitrate_max, vlc_bool_t b_all, vlc_bool_t b_audio,
                               vlc_bool_t b_video );
 
-
 #define GUID_FMT "%8.8x-%4.4x-%4.4x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
 #define GUID_PRINT( guid )  \
     (guid).v1,              \
@@ -145,3 +146,5 @@ static const guid_t asf_object_header_extension_guid =
     0x11CF,
     { 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }
 };
+
+#endif
diff --git a/modules/access/mms/buffer.h b/modules/access/mms/buffer.h
index f17a2aede7..e969fe37a7 100644
--- a/modules/access/mms/buffer.h
+++ b/modules/access/mms/buffer.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef _MMS_BUFFER_H_
+#define _MMS_BUFFER_H_ 1
+
 typedef struct
 {
     uint8_t *p_data;    // pointer on data
@@ -30,7 +33,6 @@ typedef struct
     int    i_size;     // size of p_data memory allocated
 } var_buffer_t;
 
-
 /*****************************************************************************
  * Macro/Function to create/manipulate buffer
  *****************************************************************************/
@@ -54,3 +56,4 @@ int       var_buffer_getmemory ( var_buffer_t *p_buf, void *p_mem, int64_t i_mem
 int       var_buffer_readempty( var_buffer_t *p_buf );
 void      var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid );
 
+#endif
diff --git a/modules/access/mms/mms.h b/modules/access/mms/mms.h
index ddc0bfd6e9..b78fac3c8c 100644
--- a/modules/access/mms/mms.h
+++ b/modules/access/mms/mms.h
@@ -21,12 +21,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef _MMS_H_
+#define _MMS_H_ 1
+
 #define MMS_PROTO_AUTO  0
 #define MMS_PROTO_TCP   1
 #define MMS_PROTO_UDP   2
 #define MMS_PROTO_HTTP  3
 
-
 /* mmst and mmsu */
 int  E_( MMSTUOpen )  ( access_t * );
 void E_( MMSTUClose ) ( access_t * );
@@ -34,3 +36,6 @@ void E_( MMSTUClose ) ( access_t * );
 /* mmsh */
 int  E_( MMSHOpen )  ( access_t * );
 void E_( MMSHClose ) ( access_t * );
+
+#endif
+
diff --git a/modules/access/mms/mmsh.h b/modules/access/mms/mmsh.h
index bf25ac0b9a..f5c63604bc 100644
--- a/modules/access/mms/mmsh.h
+++ b/modules/access/mms/mmsh.h
@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef _MMSH_H_
+#define _MMSH_H_ 1
+
 typedef struct
 {
     uint16_t i_type;
@@ -66,3 +69,5 @@ struct access_sys_t
     asf_header_t    asfh;
     guid_t          guid;
 };
+
+#endif
diff --git a/modules/access/mms/mmstu.h b/modules/access/mms/mmstu.h
index bf84207247..2fa24ef8f5 100644
--- a/modules/access/mms/mmstu.h
+++ b/modules/access/mms/mmstu.h
@@ -21,34 +21,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifndef _MMSTU_H_
+#define _MMSTU_H_ 1
+
 #define MMS_PACKET_ANY          0
 #define MMS_PACKET_CMD          1
 #define MMS_PACKET_HEADER       2
 #define MMS_PACKET_MEDIA        3
 #define MMS_PACKET_UDP_TIMING   4
 
-
 #define MMS_CMD_HEADERSIZE  48
 
 #define MMS_BUFFER_SIZE 100000
 struct access_sys_t
 {
-    int                 i_proto;        /* MMS_PROTO_TCP, MMS_PROTO_UDP */
-    int                 i_handle_tcp;   /* TCP socket for communication with server */
-    int                 i_handle_udp;   /* Optional UDP socket for data(media/header packet) */
-                                        /* send by server */
-    char                sz_bind_addr[NI_MAXNUMERICHOST]; /* used by udp */
+    int         i_proto;        /* MMS_PROTO_TCP, MMS_PROTO_UDP */
+    int         i_handle_tcp;   /* TCP socket for communication with server */
+    int         i_handle_udp;   /* Optional UDP socket for data(media/header packet) */
+                                /* send by server */
+    char        sz_bind_addr[NI_MAXNUMERICHOST]; /* used by udp */
 
-    vlc_url_t           url;
+    vlc_url_t   url;
 
-    asf_header_t        asfh;
+    asf_header_t    asfh;
 
     /* */
-    uint8_t             buffer_tcp[MMS_BUFFER_SIZE];
-    int                 i_buffer_tcp;
+    uint8_t     buffer_tcp[MMS_BUFFER_SIZE];
+    int         i_buffer_tcp;
 
-    uint8_t             buffer_udp[MMS_BUFFER_SIZE];
-    int                 i_buffer_udp;
+    uint8_t     buffer_udp[MMS_BUFFER_SIZE];
+    int         i_buffer_udp;
 
     /* data necessary to send data to server */
     guid_t      guid;
@@ -86,7 +88,8 @@ struct access_sys_t
     int         i_max_bit_rate;
     int         i_header_size;
 
-    /* */
+    /* misc */
     vlc_bool_t  b_seekable;
 };
 
+#endif