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

liukd · Aug 11, 2008 · c0f4bfc · c0f4bfc
1 parent 3c1f9b9
commit c0f4bfc
Show file tree

Hide file tree

Showing 52 changed files with 104 additions and 104 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)