summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-29 23:25:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-29 23:25:11 +0000
commita022eca50cbd12d7cb75aac6b4aefb9edecdfb2e (patch)
tree7052ae122620a2a24a46d66892c011c43e485a3a /libass
parent933277ac0fbd7a77eed129ea435c488e036dbab1 (diff)
downloadmpv-a022eca50cbd12d7cb75aac6b4aefb9edecdfb2e.tar.bz2
mpv-a022eca50cbd12d7cb75aac6b4aefb9edecdfb2e.tar.xz
Consistently give all libass multiple inclusion guards a LIBASS_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25927 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass.h6
-rw-r--r--libass/ass_bitmap.h6
-rw-r--r--libass/ass_cache.h6
-rw-r--r--libass/ass_font.h6
-rw-r--r--libass/ass_fontconfig.h6
-rw-r--r--libass/ass_library.h6
-rw-r--r--libass/ass_mp.h6
-rw-r--r--libass/ass_types.h6
-rw-r--r--libass/ass_utils.h6
-rw-r--r--libass/mputils.h6
10 files changed, 30 insertions, 30 deletions
diff --git a/libass/ass.h b/libass/ass.h
index e88d69d005..92d4142624 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 LIBASS_ASS_H
+#define LIBASS_ASS_H
#include "ass_types.h"
@@ -210,4 +210,4 @@ void ass_clear_fonts(ass_library_t* library);
*/
long long ass_step_sub(ass_track_t* track, long long now, int movement);
-#endif /* ASS_H */
+#endif /* LIBASS_ASS_H */
diff --git a/libass/ass_bitmap.h b/libass/ass_bitmap.h
index 7e47875b6d..12a5da0ab1 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 LIBASS_BITMAP_H
+#define LIBASS_BITMAP_H
typedef struct ass_synth_priv_s ass_synth_priv_t;
@@ -45,4 +45,4 @@ int glyph_to_bitmap(ass_synth_priv_t* priv, FT_Glyph glyph, FT_Glyph outline_gly
void ass_free_bitmap(bitmap_t* bm);
-#endif /* ASS_BITMAP_H */
+#endif /* LIBASS_BITMAP_H */
diff --git a/libass/ass_cache.h b/libass/ass_cache.h
index cc5af4bd08..e0a220bb74 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 LIBASS_CACHE_H
+#define LIBASS_CACHE_H
void ass_font_cache_init(void);
ass_font_t* ass_font_cache_find(ass_font_desc_t* desc);
@@ -94,4 +94,4 @@ void hashmap_done(hashmap_t* map);
void* hashmap_insert(hashmap_t* map, void* key, void* value);
void* hashmap_find(hashmap_t* map, void* key);
-#endif /* ASS_CACHE_H */
+#endif /* LIBASS_CACHE_H */
diff --git a/libass/ass_font.h b/libass/ass_font.h
index 60b7746a7d..53cda0ad43 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 LIBASS_FONT_H
+#define LIBASS_FONT_H
typedef struct ass_font_desc_s {
char* family;
@@ -48,4 +48,4 @@ FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch
FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2);
void ass_font_free(ass_font_t* font);
-#endif /* ASS_FONT_H */
+#endif /* LIBASS_FONT_H */
diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h
index 1ae5157e0b..9e0eca371b 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 LIBASS_FONTCONFIG_H
+#define LIBASS_FONTCONFIG_H
#ifdef HAVE_FONTCONFIG
#include <fontconfig/fontconfig.h>
@@ -31,4 +31,4 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con
char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code);
void fontconfig_done(fc_instance_t* priv);
-#endif /* ASS_FONTCONFIG_H */
+#endif /* LIBASS_FONTCONFIG_H */
diff --git a/libass/ass_library.h b/libass/ass_library.h
index 0adadced8f..adab0fdc42 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 LIBASS_LIBRARY_H
+#define LIBASS_LIBRARY_H
typedef struct ass_fontdata_s {
char* name;
@@ -36,4 +36,4 @@ struct ass_library_s {
int num_fontdata;
};
-#endif /* ASS_LIBRARY_H */
+#endif /* LIBASS_LIBRARY_H */
diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index 47e3f2787a..be98dc7a82 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 LIBASS_MP_H
+#define LIBASS_MP_H
#include "subreader.h"
@@ -53,4 +53,4 @@ typedef struct {
extern int ass_force_reload;
ass_image_t* ass_mp_render_frame(ass_renderer_t *priv, ass_track_t* track, long long now, int* detect_change);
-#endif /* ASS_MP_H */
+#endif /* LIBASS_MP_H */
diff --git a/libass/ass_types.h b/libass/ass_types.h
index 577379c810..cf39846e67 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 LIBASS_TYPES_H
+#define LIBASS_TYPES_H
#define VALIGN_SUB 0
#define VALIGN_CENTER 8
@@ -110,4 +110,4 @@ typedef struct ass_track_s {
parser_priv_t* parser_priv;
} ass_track_t;
-#endif /* ASS_TYPES_H */
+#endif /* LIBASS_TYPES_H */
diff --git a/libass/ass_utils.h b/libass/ass_utils.h
index be8b3dfa97..f574409783 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 LIBASS_UTILS_H
+#define LIBASS_UTILS_H
int mystrtoi(char** p, int base, int* res);
int mystrtou32(char** p, int base, uint32_t* res);
@@ -57,4 +57,4 @@ static inline int double_to_d16(double x) {
return (int)(x * 0x10000);
}
-#endif /* ASS_UTILS_H */
+#endif /* LIBASS_UTILS_H */
diff --git a/libass/mputils.h b/libass/mputils.h
index 1814af633e..192cbdb9b8 100644
--- a/libass/mputils.h
+++ b/libass/mputils.h
@@ -1,5 +1,5 @@
-#ifndef MPUTILS_H
-#define MPUTILS_H
+#ifndef LIBASS_MPUTILS_H
+#define LIBASS_MPUTILS_H
#include "mp_msg.h"
#include "help_mp.h"
@@ -8,4 +8,4 @@
#include "libvo/sub.h" // for utf8_get_char
#include "libavutil/common.h"
-#endif /* MPUTILS_H */
+#endif /* LIBASS_MPUTILS_H */