From c0f4bfc5d85c96cf29f4bd05fa5fa42eb344d1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 11 Aug 2008 19:13:10 +0300 Subject: [PATCH] Headers: use non-reserved identifiers for multi-inclusion protection --- include/vlc/deprecated.h | 4 ++-- include/vlc/libvlc_events.h | 4 ++-- include/vlc/libvlc_media_list.h | 4 ++-- include/vlc/libvlc_structures.h | 4 ++-- include/vlc/libvlc_vlm.h | 4 ++-- include/vlc/mediacontrol.h | 4 ++-- include/vlc/mediacontrol_structures.h | 4 ++-- include/vlc/vlc.h | 4 ++-- include/vlc_access.h | 4 ++-- include/vlc_acl.h | 4 ++-- include/vlc_aout.h | 4 ++-- include/vlc_arrays.h | 4 ++-- include/vlc_bits.h | 4 ++-- include/vlc_block.h | 4 ++-- include/vlc_block_helper.h | 4 ++-- include/vlc_charset.h | 4 ++-- include/vlc_codec.h | 4 ++-- include/vlc_codecs.h | 4 ++-- include/vlc_config_cat.h | 4 ++-- include/vlc_configuration.h | 4 ++-- include/vlc_demux.h | 4 ++-- include/vlc_devices.h | 4 ++-- include/vlc_epg.h | 4 ++-- include/vlc_es.h | 4 ++-- include/vlc_es_out.h | 4 ++-- include/vlc_filter.h | 4 ++-- include/vlc_httpd.h | 4 ++-- include/vlc_image.h | 4 ++-- include/vlc_input.h | 4 ++-- include/vlc_interface.h | 4 ++-- include/vlc_intf_strings.h | 4 ++-- include/vlc_keys.h | 4 ++-- include/vlc_md5.h | 4 ++-- include/vlc_messages.h | 4 ++-- include/vlc_meta.h | 4 ++-- include/vlc_network.h | 4 ++-- include/vlc_osd.h | 4 ++-- include/vlc_playlist.h | 4 ++-- include/vlc_rand.h | 4 ++-- include/vlc_services_discovery.h | 4 ++-- include/vlc_sout.h | 4 ++-- include/vlc_stream.h | 4 ++-- include/vlc_strings.h | 4 ++-- include/vlc_threads.h | 4 ++-- include/vlc_tls.h | 4 ++-- include/vlc_update.h | 4 ++-- include/vlc_url.h | 4 ++-- include/vlc_variables.h | 4 ++-- include/vlc_vlm.h | 4 ++-- include/vlc_vod.h | 4 ++-- include/vlc_vout.h | 4 ++-- include/vlc_xml.h | 4 ++-- 52 files changed, 104 insertions(+), 104 deletions(-) diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h index 0238e5d95d..4cf2bb77f9 100644 --- a/include/vlc/deprecated.h +++ b/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" { diff --git a/include/vlc/libvlc_events.h b/include/vlc/libvlc_events.h index cd2acc2cdb..f40479fbdb 100644 --- a/include/vlc/libvlc_events.h +++ b/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" { diff --git a/include/vlc/libvlc_media_list.h b/include/vlc/libvlc_media_list.h index e02e12220c..c263c5149a 100644 --- a/include/vlc/libvlc_media_list.h +++ b/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" { diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h index f2eebd9c63..125501e4c2 100644 --- a/include/vlc/libvlc_structures.h +++ b/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 diff --git a/include/vlc/libvlc_vlm.h b/include/vlc/libvlc_vlm.h index aff9bcb811..08fe7cb0cf 100644 --- a/include/vlc/libvlc_vlm.h +++ b/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" { diff --git a/include/vlc/mediacontrol.h b/include/vlc/mediacontrol.h index 46da6173b8..0ff0c5d0de 100644 --- a/include/vlc/mediacontrol.h +++ b/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" { diff --git a/include/vlc/mediacontrol_structures.h b/include/vlc/mediacontrol_structures.h index dbcf5aae5a..b2e42d4039 100644 --- a/include/vlc/mediacontrol_structures.h +++ b/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" { diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h index cb02016486..8527559d14 100644 --- a/include/vlc/vlc.h +++ b/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" { diff --git a/include/vlc_access.h b/include/vlc_access.h index 26a867c573..a3c5be99c9 100644 --- a/include/vlc_access.h +++ b/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 diff --git a/include/vlc_acl.h b/include/vlc_acl.h index 2aa6703079..5e1ebd57cd 100644 --- a/include/vlc_acl.h +++ b/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) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 30f144ef43..7d119845cc 100644 --- a/include/vlc_aout.h +++ 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" { diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index 7ac9290e31..a95bc23884 100644 --- a/include/vlc_arrays.h +++ b/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 diff --git a/include/vlc_bits.h b/include/vlc_bits.h index 23f952c96f..9f3d7fda38 100644 --- a/include/vlc_bits.h +++ b/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 { diff --git a/include/vlc_block.h b/include/vlc_block.h index 857b41d2dc..cdd337a1ba 100644 --- a/include/vlc_block.h +++ b/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: diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h index 4fe6e76985..679d0e5152 100644 --- a/include/vlc_block_helper.h +++ b/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 diff --git a/include/vlc_charset.h b/include/vlc_charset.h index 0788b17f24..3392bc13b3 100644 --- a/include/vlc_charset.h +++ b/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 #include diff --git a/include/vlc_codec.h b/include/vlc_codec.h index ffc33e7b6c..b8347e34d2 100644 --- a/include/vlc_codec.h +++ b/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 #include diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index ad9f94b985..988c5901ea 100644 --- a/include/vlc_codecs.h +++ b/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__)) diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index c259afcd0a..9696abc95b 100644 --- a/include/vlc_config_cat.h +++ b/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 diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h index b9c047fa39..5e0911ac7a 100644 --- a/include/vlc_configuration.h +++ b/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 diff --git a/include/vlc_demux.h b/include/vlc_demux.h index e7a39da157..5a0fc0b7ee 100644 --- a/include/vlc_demux.h +++ b/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 #include diff --git a/include/vlc_devices.h b/include/vlc_devices.h index dd5279e127..46b74124de 100644 --- a/include/vlc_devices.h +++ b/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 { diff --git a/include/vlc_epg.h b/include/vlc_epg.h index 26141ac158..25a9431262 100644 --- a/include/vlc_epg.h +++ b/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 { diff --git a/include/vlc_es.h b/include/vlc_es.h index d020d134ac..0a4e622db7 100644 --- a/include/vlc_es.h +++ b/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 */ diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h index b5853456fa..782c1b3fd4 100644 --- a/include/vlc_es_out.h +++ b/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 diff --git a/include/vlc_filter.h b/include/vlc_filter.h index b1f2325058..88e7c94a5c 100644 --- a/include/vlc_filter.h +++ b/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 diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h index 7be391ebe9..2bbf47d719 100644 --- a/include/vlc_httpd.h +++ b/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 { diff --git a/include/vlc_image.h b/include/vlc_image.h index c554564a90..cd7686a331 100644 --- a/include/vlc_image.h +++ b/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 diff --git a/include/vlc_input.h b/include/vlc_input.h index 900c3f353e..8663f11c5f 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -23,8 +23,8 @@ *****************************************************************************/ /* __ is need because conflict with */ -#ifndef _VLC__INPUT_H -#define _VLC__INPUT_H 1 +#ifndef VLC__INPUT_H +#define VLC__INPUT_H 1 #include #include diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 65febc9dab..5c13eaa2ea 100644 --- a/include/vlc_interface.h +++ b/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" { diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h index 18cfc019d7..050ffd370b 100644 --- a/include/vlc_intf_strings.h +++ b/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 **************/ diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 3275fedf48..87541d50ce 100644 --- a/include/vlc_keys.h +++ b/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 diff --git a/include/vlc_md5.h b/include/vlc_md5.h index 46f10f0143..9acca98e43 100644 --- a/include/vlc_md5.h +++ b/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 diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 1ce7d7b914..c4113677fd 100644 --- a/include/vlc_messages.h +++ b/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 diff --git a/include/vlc_meta.h b/include/vlc_meta.h index a8f2ab7120..19be4122bc 100644 --- a/include/vlc_meta.h +++ b/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 diff --git a/include/vlc_network.h b/include/vlc_network.h index 2f57af7624..8a2b440f83 100644 --- a/include/vlc_network.h +++ b/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) diff --git a/include/vlc_osd.h b/include/vlc_osd.h index bfbd4272e9..d9fa797edb 100644 --- a/include/vlc_osd.h +++ b/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" diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index beebba4f8a..b1ffaca5d8 100644 --- a/include/vlc_playlist.h +++ b/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" { diff --git a/include/vlc_rand.h b/include/vlc_rand.h index 4225316cb1..2afff1905d 100644 --- a/include/vlc_rand.h +++ b/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) ); diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h index 92c7d19aad..33e354b045 100644 --- a/include/vlc_services_discovery.h +++ b/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" { diff --git a/include/vlc_sout.h b/include/vlc_sout.h index d1a75ad8b5..576e8305eb 100644 --- a/include/vlc_sout.h +++ b/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" { diff --git a/include/vlc_stream.h b/include/vlc_stream.h index bb947c9428..13a0155a01 100644 --- a/include/vlc_stream.h +++ b/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 diff --git a/include/vlc_strings.h b/include/vlc_strings.h index 6efe4372c8..82d947a309 100644 --- a/include/vlc_strings.h +++ b/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 diff --git a/include/vlc_threads.h b/include/vlc_threads.h index ad1f80bd3c..c84512b977 100644 --- a/include/vlc_threads.h +++ b/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 */ diff --git a/include/vlc_tls.h b/include/vlc_tls.h index f6c480667f..7bf3500fca 100644 --- a/include/vlc_tls.h +++ b/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 diff --git a/include/vlc_update.h b/include/vlc_update.h index c7795c9862..d53d898a6f 100644 --- a/include/vlc_update.h +++ b/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 diff --git a/include/vlc_url.h b/include/vlc_url.h index c996f3fcc3..4e95c7d7d8 100644 --- a/include/vlc_url.h +++ b/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 { diff --git a/include/vlc_variables.h b/include/vlc_variables.h index 04196fdd86..7c2bbd4c56 100644 --- a/include/vlc_variables.h +++ b/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 diff --git a/include/vlc_vlm.h b/include/vlc_vlm.h index b3c712aa66..d85034f93e 100644 --- a/include/vlc_vlm.h +++ b/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 diff --git a/include/vlc_vod.h b/include/vlc_vod.h index f055435c31..52cdd3029e 100644 --- a/include/vlc_vod.h +++ b/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 { diff --git a/include/vlc_vout.h b/include/vlc_vout.h index d3382771ab..f80688815e 100644 --- a/include/vlc_vout.h +++ b/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 #include diff --git a/include/vlc_xml.h b/include/vlc_xml.h index fde4b7fad6..1b600b73f2 100644 --- a/include/vlc_xml.h +++ b/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" {