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

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index 0238e5d95d7d690f94fab84605db8371f70f861a..4cf2bb77f914f5c3095965146ff6c6c7e0b1e203 100644 (file)
--- 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 cd2acc2cdbab3a07c0e148f0edbfdf63a9e0dca8..f40479fbdb5cf6e228dd494b49f0135159642e5f 100644 (file)
--- 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 e02e12220c71b5a9ea06744bb169c0a38e3645a6..c263c5149ad3ea870689fac4afca5f5720fb8221 100644 (file)
--- 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 f2eebd9c6390cb21cd709e9911549d3eb8f62f49..125501e4c28bed2b6f8319aa585eb8b64e26f828 100644 (file)
--- 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 <stdint.h>
 

diff --git a/include/vlc/libvlc_vlm.h b/include/vlc/libvlc_vlm.h
index aff9bcb81136ce22ede2e7d90f5793dce55f83bc..08fe7cb0cfd587d26eb374112ca54b7db4d155fb 100644 (file)
--- 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 46da6173b80d1d976b3bafc6719bcf8c7f7db667..0ff0c5d0de0803c3f6cfcb5387198dd4b0e5086e 100644 (file)
--- 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 dbcf5aae5a6fd6f3b3df4bbbb653ae416bebda61..b2e42d4039f4f5adae98ac734e0032a18e5ba83f 100644 (file)
--- 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 cb020164868ef7ca6f8f75fbdd8967402d98940a..8527559d14317f20c0d97f58b61b5e1ddd57a59d 100644 (file)
--- 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 26a867c5737bd6a2820e8c5bd879de03f2051a78..a3c5be99c9789f1b97c456e229f6543972207970 100644 (file)
--- 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 <vlc_block.h>
 

diff --git a/include/vlc_acl.h b/include/vlc_acl.h
index 2aa6703079e7d82100fdbd1650c48488782b0ac3..5e1ebd57cd87af912a1bd524bc64258aa972e6b2 100644 (file)
--- 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 30f144ef43ff5a2d7cdfe6a822a3b53ce8e0e7e8..7d119845ccc52ab48a7a52923f668f0c6dfd6ae5 100644 (file)
--- 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 7ac9290e3183ddf36ce366705a8ca9b7c8f102a0..a95bc2388459ac0c5f28841d968d76606a536783 100644 (file)
--- 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 23f952c96f9e9dee6d06e0a9e59d4bf719a61ff0..9f3d7fda389ed281934150445353867c375499bd 100644 (file)
--- 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 857b41d2dc006f3c4d7fd114efbe6f275e1b298c..cdd337a1badab56d41f5822cdb10be2043e9e6a3 100644 (file)
--- 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 4fe6e76985cb850d4fb8938eef809fe75bfcbc84..679d0e5152a9b335cd2bff18b8ea875187e5bc9c 100644 (file)
--- 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 <vlc_block.h>
 

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 0788b17f2487a22747d8e75dd6f05dac615c1d70..3392bc13b3085fc54d08995fd20efc774d4ddcdb 100644 (file)
--- 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 <stdarg.h>
 #include <sys/types.h>

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index ffc33e7b6caaaea06873838168c1b2c457dbb814..b8347e34d2c870af54ab8244c14ac1574a3b9a77 100644 (file)
--- 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 <vlc_block.h>
 #include <vlc_es.h>

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index ad9f94b985a86fd42b7e0bf5f87397e74a6b986d..988c5901eaf1dc188bbfba2192f02f91d623646c 100644 (file)
--- 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 c259afcd0a5c7fc24d140bbf90de99fb966d4ffe..9696abc95b9966049fb4cb96f7e5bfd8617b19ed 100644 (file)
--- 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 b9c047fa397ed8ad9cedc5c0012b0c861bb55359..5e0911ac7a6a7717b2b4f2024dc2b9e1a5ea52c4 100644 (file)
--- 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 e7a39da157c48b290f7111d814864dbe14503581..5a0fc0b7eeafa1f34fe08c4c3b0b518306de7a60 100644 (file)
--- 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 <vlc_es.h>
 #include <vlc_stream.h>

diff --git a/include/vlc_devices.h b/include/vlc_devices.h
index dd5279e1278dbf9b1fa10e6e6eedf2bcdc5c5c1a..46b74124def4d7d8a3b4af99d48a89e8f033a0f4 100644 (file)
--- 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 26141ac158100a0f38114ad7a209d62b4a40ff85..25a94312623a6fda83c520dc2a4df35ce05897a4 100644 (file)
--- 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 d020d134ac7442f0568b5a67edc70b2220190c6e..0a4e622db789493fa0070a4103fa265ff479e0c1 100644 (file)
--- 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 b5853456fa8c95a3b97e36715d6104a50abcf53f..782c1b3fd4fa2cc6da86656d6f0cdef6fd72f9cb 100644 (file)
--- 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 b1f23250587053a332e7d99a4597a03445c24b5b..88e7c94a5c293077ec9985d67e60ca9eec5b6b29 100644 (file)
--- 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 <vlc_es.h>
 

diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h
index 7be391ebe9e440786340452eaf59da1856bd3500..2bbf47d7196ad7647a700182b16a74987398e5e0 100644 (file)
--- 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 c554564a90a168cf83a8a17b28336a0828fbce8a..cd7686a33189502e36601f05db2c9f885ef4ce1c 100644 (file)
--- 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 <vlc_vout.h>
 

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 900c3f353e7c4a2dbbe0d4edff6b684eb5b3573b..8663f11c5f852d391d390051ea17b3caafeafe52 100644 (file)
--- a/include/vlc_input.h
+++ b/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>

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 65febc9dabd70f98f5abdc5a164739a461405b20..5c13eaa2ea0963e94d27bbbb0b26ccdc4538bf16 100644 (file)
--- 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 18cfc019d78a96b8bdc60c2a2b5b4481c4be5be9..050ffd370b8565d16a86014b0cdb1bae7b4c99d5 100644 (file)
--- 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 3275fedf4856b0b78bcb316fa33fe9d9ef5439f7..87541d50ceb9ec61f72cd5f6997f1ef5b7ed3c12 100644 (file)
--- 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 46f10f01439edbcc8bad45673cc302039b76dd5b..9acca98e4306707ed66be0210523aef73fface9c 100644 (file)
--- 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 1ce7d7b914ac6cac8c52844c11c2923897ff02da..c4113677fd8e1e88bd4d916ef75d3bccda45fd6f 100644 (file)
--- 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 <stdarg.h>
 

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index a8f2ab7120649a6ccedf3bdd7c87e9b6a035cd4d..19be4122bc04179d62b56fd392b9deb3a789a73b 100644 (file)
--- 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 <vlc_arrays.h>
 

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 2f57af76245fe9636a3050014c6ad510a8f88d15..8a2b440f83fd3b5ad945cbc7676ac431ff6c3688 100644 (file)
--- 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 bfbd4272e9f38fda217d184aed09c036332b9ffe..d9fa797edb3d5ca99025eb8919cba7269ee23319 100644 (file)
--- 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 beebba4f8aaa0d68f5f9e9e5f8eb597a5e199e6a..b1ffaca5d804e618727c2fbeef3fbbf4d32df095 100644 (file)
--- 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 4225316cb1d4d3335d278103e844bffce84db4a4..2afff1905deb633965233979973f3fad6db94ad5 100644 (file)
--- 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 92c7d19aad77f4ac1e5c270943013795cd83efc4..33e354b045cf2483be95921e1fe0dfd962f7ba3f 100644 (file)
--- 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 d1a75ad8b5b079db9c4bd3b4370bcbe5e0c3ae19..576e8305eb8e07e115c6ad95d36c22ba7af2750a 100644 (file)
--- 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 bb947c94285b469ad406f2f2241eea197e99c958..13a0155a018f627e07c67f16b8874671e82cfc84 100644 (file)
--- 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 <vlc_block.h>
 

diff --git a/include/vlc_strings.h b/include/vlc_strings.h
index 6efe4372c8d1e5741355ac05d27865b77b17e2ae..82d947a30939fdfa043f05a4ad63096e66d511e8 100644 (file)
--- 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 ad1f80bd3c3b4f2184d59094e4fb7d0f001cb423..c84512b977f24478bca05eb986a824d99c62b03d 100644 (file)
--- 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 f6c480667fe66bec3b923986cf60492af96d1f1b..7bf3500fca7cd75703169e569798af6384b0d774 100644 (file)
--- 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 <vlc_network.h>
 

diff --git a/include/vlc_update.h b/include/vlc_update.h
index c7795c98622e4631f1c9379e9b882689fb0ebd26..d53d898a6f9bded53fa702de57a420dde240051c 100644 (file)
--- 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 c996f3fcc3915ea92860727270599066dfa2216e..4e95c7d7d83bbdf8e11546b0328134601d5092fb 100644 (file)
--- 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 04196fdd86aae28c5447c02cf2cbfc24546d0204..7c2bbd4c565648301253e4edd54165f653ca51f3 100644 (file)
--- 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 b3c712aa66a2839704181089ed738e00e7484da8..d85034f93edbabae9ce05dd27805dfde1115d5df 100644 (file)
--- 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 <vlc_input.h>
 

diff --git a/include/vlc_vod.h b/include/vlc_vod.h
index f055435c316b78e4dcd8f5fa0936229c9035e3e0..52cdd3029ea4d525035fbf6c7898049d082f8252 100644 (file)
--- 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 d3382771abdb0de8d41200fec1a56d4b2b50f9c3..f80688815ef78ccec4a7cecf4d9d00b7466d72dc 100644 (file)
--- 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 <vlc_es.h>
 #include <vlc_filter.h>

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index fde4b7fad6f327674fc98b87cd5776a57403fab3..1b600b73f2e15942a01195817bb6a29b07b5b50b 100644 (file)
--- 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" {