From 3e9e4acd8dd7b602519a0f5659e6e108efdf31fe Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Jul 2007 22:34:45 +0000 Subject: Do not use leading underscores in multiple inclusion guards, they are reserved. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libass/ass.h | 4 ++-- libass/ass_bitmap.h | 4 ++-- libass/ass_cache.h | 4 ++-- libass/ass_font.h | 4 ++-- libass/ass_fontconfig.h | 4 ++-- libass/ass_library.h | 4 ++-- libass/ass_mp.h | 4 ++-- libass/ass_types.h | 4 ++-- libass/ass_utils.h | 4 ++-- libass/mputils.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'libass') diff --git a/libass/ass.h b/libass/ass.h index fb66b20420..e20e6bb175 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_H__ -#define __ASS_H__ +#ifndef ASS_H +#define ASS_H #include "ass_types.h" diff --git a/libass/ass_bitmap.h b/libass/ass_bitmap.h index ba5867f7cc..3394ab2d52 100644 --- a/libass/ass_bitmap.h +++ b/libass/ass_bitmap.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_BITMAP_H__ -#define __ASS_BITMAP_H__ +#ifndef ASS_BITMAP_H +#define ASS_BITMAP_H typedef struct ass_synth_priv_s ass_synth_priv_t; diff --git a/libass/ass_cache.h b/libass/ass_cache.h index caa750a54f..c601caf6c0 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_CACHE_H__ -#define __ASS_CACHE_H__ +#ifndef ASS_CACHE_H +#define ASS_CACHE_H void ass_font_cache_init(void); ass_font_t* ass_font_cache_find(ass_font_desc_t* desc); diff --git a/libass/ass_font.h b/libass/ass_font.h index 85c0218bd8..6d10ad18db 100644 --- a/libass/ass_font.h +++ b/libass/ass_font.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_FONT_H__ -#define __ASS_FONT_H__ +#ifndef ASS_FONT_H +#define ASS_FONT_H #ifdef HAVE_FONTCONFIG #include diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index a296bcef3e..30cd30dbf4 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_FONTCONFIG_H__ -#define __ASS_FONTCONFIG_H__ +#ifndef ASS_FONTCONFIG_H +#define ASS_FONTCONFIG_H #ifdef HAVE_FONTCONFIG #include diff --git a/libass/ass_library.h b/libass/ass_library.h index 34a8b7a034..4cebe42e43 100644 --- a/libass/ass_library.h +++ b/libass/ass_library.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_LIBRARY_H__ -#define __ASS_LIBRARY_H__ +#ifndef ASS_LIBRARY_H +#define ASS_LIBRARY_H typedef struct ass_fontdata_s { char* name; diff --git a/libass/ass_mp.h b/libass/ass_mp.h index 5439a76001..c5541465ae 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_MP_H__ -#define __ASS_MP_H__ +#ifndef ASS_MP_H +#define ASS_MP_H #include "subreader.h" diff --git a/libass/ass_types.h b/libass/ass_types.h index 0795d56371..e0c71a96a7 100644 --- a/libass/ass_types.h +++ b/libass/ass_types.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_TYPES_H__ -#define __ASS_TYPES_H__ +#ifndef ASS_TYPES_H +#define ASS_TYPES_H #define VALIGN_SUB 0 #define VALIGN_CENTER 8 diff --git a/libass/ass_utils.h b/libass/ass_utils.h index 53b4b4f96a..5e2adecdfa 100644 --- a/libass/ass_utils.h +++ b/libass/ass_utils.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __ASS_UTILS_H__ -#define __ASS_UTILS_H__ +#ifndef ASS_UTILS_H +#define ASS_UTILS_H int mystrtoi(char** p, int base, int* res); int mystrtou32(char** p, int base, uint32_t* res); diff --git a/libass/mputils.h b/libass/mputils.h index 5ed1be527e..ef7c8e4fe6 100644 --- a/libass/mputils.h +++ b/libass/mputils.h @@ -1,5 +1,5 @@ -#ifndef __ASS_MPUTILS_H__ -#define __ASS_MPUTILS_H__ +#ifndef ASS_MPUTILS_H +#define ASS_MPUTILS_H #include "mp_msg.h" #include "help_mp.h" -- cgit v1.2.3