Don't try IPv6 SSM if not defined

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 52bbcffa87976e0b25c36c2e761fe34cbcbd84b1..914a7514c0f5f2a9639237914aacd33b457f6c91 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -35,17 +35,12 @@ struct libvlc_global_data_t
 
     vlc_bool_t             b_ready;     ///< Initialization boolean
     uint32_t               i_cpu;       ///< CPU extensions
-    
-    int                    i_verbose;   ///< info messages
-    vlc_bool_t             b_color;     ///< color messages?
 
-    /* Object structure data */
+   /* Object structure data */
     int                    i_counter;   ///< object counter
     int                    i_objects;   ///< Attached objects count
     vlc_object_t **        pp_objects;  ///< Array of all objects 
 
-    msg_bank_t             msg_bank;    ///< The message bank
-
     module_bank_t *        p_module_bank; ///< The module bank
     intf_thread_t         *p_probe;       ///< Devices prober
 
@@ -80,28 +75,31 @@ struct libvlc_int_t
     VLC_COMMON_MEMBERS
 
     /* Global properties */
-    int                    i_argc;           /* command line arguments count */
-    char **                ppsz_argv;              /* command line arguments */
-    char *                 psz_homedir;           /* configuration directory */
-    char *                 psz_userdir;             /* user's home directory */
-    char *                 psz_configfile;        /* location of config file */
+    int                    i_argc;           ///< command line arguments count
+    char **                ppsz_argv;        ///< command line arguments
+    char *                 psz_homedir;      ///< configuration directory
+    char *                 psz_userdir;      ///< user's home directory
+    char *                 psz_configfile;   ///< location of config file
+
+    playlist_t            *p_playlist;       ///< playlist object
+
+    /* Messages */
+    msg_bank_t             msg_bank;    ///< The message bank
+    int                    i_verbose;   ///< info messages
+    vlc_bool_t             b_color;     ///< color messages?
 
-    /* Fast memcpy plugin used */
-    module_t *             p_memcpy_module;
-    void* ( *pf_memcpy ) ( void *, const void *, size_t );
-    void* ( *pf_memset ) ( void *, int, size_t );
+    module_t *             p_memcpy_module;  ///< Fast memcpy plugin used
+    void* ( *pf_memcpy ) ( void *, const void *, size_t ); ///< fast memcpy 
+    void* ( *pf_memset ) ( void *, int, size_t );          ///< fast memset
 
-    /* Statistics */
-    vlc_bool_t             b_stats;       ///< Should we collect stats
-    /* Timers handling */
+    vlc_bool_t             b_stats;       ///< Should we collect stats ?
     vlc_mutex_t            timer_lock;    ///< Lock to protect timers
     int                    i_timers;      ///< Number of timers
     counter_t            **pp_timers;     ///< Array of all timers
 
-    /* Locks */
-    vlc_mutex_t            config_lock;          /* lock for the config file */
+    vlc_mutex_t            config_lock;    ///< Lock for the config file
 #ifdef __APPLE__
-    vlc_mutex_t            quicktime_lock;          /* QT is not thread safe on OSX */
+    vlc_mutex_t            quicktime_lock; ///< QT is not thread safe on OSX
 #endif
 
     /* Structure storing the action name / key associations */