Headers: use non-reserved identifiers for multi-inclusion protection

include/vlc/deprecated.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_DEPRECATED_H
-#define _LIBVLC_DEPRECATED_H 1
+#ifndef LIBVLC_DEPRECATED_H
+#define LIBVLC_DEPRECATED_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/libvlc_events.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_EVENTS_H
-#define _LIBVLC_EVENTS_H 1
+#ifndef LIBVLC_EVENTS_H
+#define LIBVLC_EVENTS_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/libvlc_media_list.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_MEDIA_LIST_H
-#define _LIBVLC_MEDIA_LIST_H 1
+#ifndef LIBVLC_MEDIA_LIST_H
+#define LIBVLC_MEDIA_LIST_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/libvlc_structures.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_STRUCTURES_H
-#define _LIBVLC_STRUCTURES_H 1
+#ifndef LIBVLC_STRUCTURES_H
+#define LIBVLC_STRUCTURES_H 1
 
 #include <stdint.h>
 

include/vlc/libvlc_vlm.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _LIBVLC_VLM_H
-#define _LIBVLC_VLM_H 1
+#ifndef LIBVLC_VLM_H
+#define LIBVLC_VLM_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/mediacontrol.h

@@ -29,8 +29,8 @@
  */
 
 
-#ifndef _VLC_CONTROL_H
-#define _VLC_CONTROL_H 1
+#ifndef VLC_CONTROL_H
+#define VLC_CONTROL_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/mediacontrol_structures.h

@@ -27,8 +27,8 @@
  * @{
  */
 
-#ifndef _VLC_CONTROL_STRUCTURES_H
-#define _VLC_CONTROL_STRUCTURES_H 1
+#ifndef VLC_CONTROL_STRUCTURES_H
+#define VLC_CONTROL_STRUCTURES_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc/vlc.h

@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VLC_H
-#define _VLC_VLC_H 1
+#ifndef VLC_VLC_H
+#define VLC_VLC_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc_access.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_ACCESS_H
-#define _VLC_ACCESS_H 1
+#ifndef VLC_ACCESS_H
+#define VLC_ACCESS_H 1
 
 #include <vlc_block.h>
 

include/vlc_acl.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_ACL_H
-# define __VLC_ACL_H
+#ifndef VLC_ACL_H
+# define VLC_ACL_H
 
 #define ACL_Create(a, b) __ACL_Create(VLC_OBJECT(a), b)
 #define ACL_Duplicate(a,b) __ACL_Duplicate(VLC_OBJECT(a),b)

include/vlc_aout.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_AOUT_H
-#define _VLC_AOUT_H 1
+#ifndef VLC_AOUT_H
+#define VLC_AOUT_H 1
 
 # ifdef __cplusplus
 extern "C" {

include/vlc_arrays.h

@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
 
-#ifndef _VLC_ARRAYS_H_
-#define _VLC_ARRAYS_H_
+#ifndef VLC_ARRAYS_H_
+#define VLC_ARRAYS_H_
 
 /**
  * Simple dynamic array handling. Array is realloced at each insert/removal

include/vlc_bits.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_BITS_H
-#define _VLC_BITS_H 1
+#ifndef VLC_BITS_H
+#define VLC_BITS_H 1
 
 typedef struct bs_s
 {

include/vlc_block.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_BLOCK_H
-#define _VLC_BLOCK_H 1
+#ifndef VLC_BLOCK_H
+#define VLC_BLOCK_H 1
 
 /****************************************************************************
  * block:

include/vlc_block_helper.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_BLOCK_HELPER_H
-#define _VLC_BLOCK_HELPER_H 1
+#ifndef VLC_BLOCK_HELPER_H
+#define VLC_BLOCK_HELPER_H 1
 
 #include <vlc_block.h>
 

include/vlc_charset.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_CHARSET_H
-#define __VLC_CHARSET_H 1
+#ifndef VLC_CHARSET_H
+#define VLC_CHARSET_H 1
 
 #include <stdarg.h>
 #include <sys/types.h>

include/vlc_codec.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_CODEC_H
-#define _VLC_CODEC_H 1
+#ifndef VLC_CODEC_H
+#define VLC_CODEC_H 1
 
 #include <vlc_block.h>
 #include <vlc_es.h>

include/vlc_codecs.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_CODECS_H
-#define _VLC_CODECS_H 1
+#ifndef VLC_CODECS_H
+#define VLC_CODECS_H 1
 
 #ifdef HAVE_ATTRIBUTE_PACKED
 #   define ATTR_PACKED __attribute__((__packed__))

include/vlc_config_cat.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_HELP_H
-#define _VLC_HELP_H 1
+#ifndef VLC_HELP_H
+#define VLC_HELP_H 1
 
 /*
  *  First, we need help strings for the General Settings and for the

include/vlc_configuration.h

@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_CONFIGURATION_H
-#define _VLC_CONFIGURATION_H 1
+#ifndef VLC_CONFIGURATION_H
+#define VLC_CONFIGURATION_H 1
 
 
 # ifdef __cplusplus

include/vlc_demux.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DEMUX_H
-#define _VLC_DEMUX_H 1
+#ifndef VLC_DEMUX_H
+#define VLC_DEMUX_H 1
 
 #include <vlc_es.h>
 #include <vlc_stream.h>

include/vlc_devices.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_DEVICES_H
-#define _VLC_DEVICES_H 1
+#ifndef VLC_DEVICES_H
+#define VLC_DEVICES_H 1
 
 enum
 {

include/vlc_epg.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_EPG_H
-#define _VLC_EPG_H 1
+#ifndef VLC_EPG_H
+#define VLC_EPG_H 1
 
 typedef struct
 {

include/vlc_es.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_ES_H
-#define _VLC_ES_H 1
+#ifndef VLC_ES_H
+#define VLC_ES_H 1
 
 /* FIXME: i'm not too sure about this include but it fixes compilation of
  * video chromas -- dionoea */

include/vlc_es_out.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_ES_OUT_H
-#define _VLC_ES_OUT_H 1
+#ifndef VLC_ES_OUT_H
+#define VLC_ES_OUT_H 1
 
 /**
  * \defgroup es out Es Out

include/vlc_filter.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_FILTER_H
-#define _VLC_FILTER_H 1
+#ifndef VLC_FILTER_H
+#define VLC_FILTER_H 1
 
 #include <vlc_es.h>
 

include/vlc_httpd.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_HTTPD_H
-#define _VLC_HTTPD_H 1
+#ifndef VLC_HTTPD_H
+#define VLC_HTTPD_H 1
 
 enum
 {

include/vlc_image.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_IMAGE_H
-#define _VLC_IMAGE_H 1
+#ifndef VLC_IMAGE_H
+#define VLC_IMAGE_H 1
 
 #include <vlc_vout.h>
 

include/vlc_input.h

@@ -23,8 +23,8 @@
  *****************************************************************************/
 
 /* __ is need because conflict with <vlc/input.h> */
-#ifndef _VLC__INPUT_H
-#define _VLC__INPUT_H 1
+#ifndef VLC__INPUT_H
+#define VLC__INPUT_H 1
 
 #include <vlc_es.h>
 #include <vlc_meta.h>

include/vlc_interface.h

@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_INTF_H_
-#define _VLC_INTF_H_
+#ifndef VLC_INTF_H_
+#define VLC_INTF_H_
 
 # ifdef __cplusplus
 extern "C" {

include/vlc_intf_strings.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_ISTRINGS_H
-#define _VLC_ISTRINGS_H 1
+#ifndef VLC_INTF_STRINGS_H
+#define VLC_INTF_STRINGS_H 1
 
 /*************** Open dialogs **************/
 

include/vlc_keys.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_KEYS_H
-#define _VLC_KEYS_H 1
+#ifndef VLC_KEYS_H
+#define VLC_KEYS_H 1
 
 #define KEY_MODIFIER         0xFF000000
 #define KEY_MODIFIER_ALT     0x01000000

include/vlc_md5.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_MD5_H
-# define _VLC_MD5_H
+#ifndef VLC_MD5_H
+# define VLC_MD5_H
 
 /*****************************************************************************
  * md5_s: MD5 message structure

include/vlc_messages.h

@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_MESSAGES_H_
-#define _VLC_MESSAGES_H_
+#ifndef VLC_MESSAGES_H_
+#define VLC_MESSAGES_H_
 
 #include <stdarg.h>
 

include/vlc_meta.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_META_H
-#define _VLC_META_H 1
+#ifndef VLC_META_H
+#define VLC_META_H 1
 
 #include <vlc_arrays.h>
 

include/vlc_network.h

@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_NETWORK_H
-# define __VLC_NETWORK_H
+#ifndef VLC_NETWORK_H
+# define VLC_NETWORK_H
 
 #if defined( WIN32 )
 #   if !defined(UNDER_CE)

include/vlc_osd.h

@@ -27,8 +27,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_OSD_H
-#define _VLC_OSD_H 1
+#ifndef VLC_OSD_H
+#define VLC_OSD_H 1
 
 #include "vlc_vout.h"
 

include/vlc_playlist.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_PLAYLIST_H_
-#define _VLC_PLAYLIST_H_
+#ifndef VLC_PLAYLIST_H_
+#define VLC_PLAYLIST_H_
 
 # ifdef __cplusplus
 extern "C" {

include/vlc_rand.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_RAND_H
-# define _VLC_RAND_H
+#ifndef VLC_RAND_H
+# define VLC_RAND_H
 
 VLC_EXPORT( void, vlc_rand_bytes, (void *buf, size_t len) );
 

include/vlc_services_discovery.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_SERVICES_DISCOVERY_H_
-#define _VLC_SERVICES_DISCOVERY_H_
+#ifndef VLC_SERVICES_DISCOVERY_H_
+#define VLC_SERVICES_DISCOVERY_H_
 
 # ifdef __cplusplus
 extern "C" {

include/vlc_sout.h

@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_SOUT_H_
-#define _VLC_SOUT_H_
+#ifndef VLC_SOUT_H_
+#define VLC_SOUT_H_
 
 #ifdef __cplusplus
 extern "C" {

include/vlc_stream.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_STREAM_H
-#define _VLC_STREAM_H 1
+#ifndef VLC_STREAM_H
+#define VLC_STREAM_H 1
 
 #include <vlc_block.h>
 

include/vlc_strings.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_STRINGS_H
-#define _VLC_STRINGS_H 1
+#ifndef VLC_STRINGS_H
+#define VLC_STRINGS_H 1
 
 /**
  * \defgroup strings Strings

include/vlc_threads.h

@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_THREADS_H_
-#define _VLC_THREADS_H_
+#ifndef VLC_THREADS_H_
+#define VLC_THREADS_H_
 
 #if defined( UNDER_CE )
                                                                 /* WinCE API */

include/vlc_tls.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_TLS_H
-# define _VLC_TLS_H
+#ifndef VLC_TLS_H
+# define VLC_TLS_H
 
 # include <vlc_network.h>
 

include/vlc_update.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _VLC_UPDATE_H
-#define _VLC_UPDATE_H
+#ifndef VLC_UPDATE_H
+#define VLC_UPDATE_H
 
 /**
  * \defgroup update Update

include/vlc_url.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef __VLC_URL_H
-# define __VLC_URL_H
+#ifndef VLC_URL_H
+# define VLC_URL_H
 
 struct vlc_url_t
 {

include/vlc_variables.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VARIABLES_H
-#define _VLC_VARIABLES_H 1
+#ifndef VLC_VARIABLES_H
+#define VLC_VARIABLES_H 1
 
 /**
  * \defgroup variables Variables

include/vlc_vlm.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VLM_H
-#define _VLC_VLM_H 1
+#ifndef VLC_VLM_H
+#define VLC_VLM_H 1
 
 #include <vlc_input.h>
 

include/vlc_vod.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VOD_H
-#define _VLC_VOD_H 1
+#ifndef VLC_VOD_H
+#define VLC_VOD_H 1
 
 struct vod_t
 {

include/vlc_vout.h

@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_VOUT_H_
-#define _VLC_VOUT_H_ 1
+#ifndef VLC_VOUT_H_
+#define VLC_VOUT_H_ 1
 
 #include <vlc_es.h>
 #include <vlc_filter.h>

include/vlc_xml.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_XML_H
-#define _VLC_XML_H
+#ifndef VLC_XML_H
+#define VLC_XML_H
 
 # ifdef __cplusplus
 extern "C" {