[MPlayer-cvslog] r25927 - in trunk/libass: ass.h ass_bitmap.h ass_cache.h ass_font.h ass_fontconfig.h ass_library.h ass_mp.h ass_types.h ass_utils.h mputils.h
diego
subversion at mplayerhq.hu
Wed Jan 30 00:25:11 CET 2008
Author: diego
Date: Wed Jan 30 00:25:11 2008
New Revision: 25927
Log:
Consistently give all libass multiple inclusion guards a LIBASS_ prefix.
Modified:
trunk/libass/ass.h
trunk/libass/ass_bitmap.h
trunk/libass/ass_cache.h
trunk/libass/ass_font.h
trunk/libass/ass_fontconfig.h
trunk/libass/ass_library.h
trunk/libass/ass_mp.h
trunk/libass/ass_types.h
trunk/libass/ass_utils.h
trunk/libass/mputils.h
Modified: trunk/libass/ass.h
==============================================================================
--- trunk/libass/ass.h (original)
+++ trunk/libass/ass.h Wed Jan 30 00:25:11 2008
@@ -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* libr
*/
long long ass_step_sub(ass_track_t* track, long long now, int movement);
-#endif /* ASS_H */
+#endif /* LIBASS_ASS_H */
Modified: trunk/libass/ass_bitmap.h
==============================================================================
--- trunk/libass/ass_bitmap.h (original)
+++ trunk/libass/ass_bitmap.h Wed Jan 30 00:25:11 2008
@@ -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* pr
void ass_free_bitmap(bitmap_t* bm);
-#endif /* ASS_BITMAP_H */
+#endif /* LIBASS_BITMAP_H */
Modified: trunk/libass/ass_cache.h
==============================================================================
--- trunk/libass/ass_cache.h (original)
+++ trunk/libass/ass_cache.h Wed Jan 30 00:25:11 2008
@@ -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 */
Modified: trunk/libass/ass_font.h
==============================================================================
--- trunk/libass/ass_font.h (original)
+++ trunk/libass/ass_font.h Wed Jan 30 00:25:11 2008
@@ -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* fontco
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 */
Modified: trunk/libass/ass_fontconfig.h
==============================================================================
--- trunk/libass/ass_fontconfig.h (original)
+++ trunk/libass/ass_fontconfig.h Wed Jan 30 00:25:11 2008
@@ -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_libra
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 */
Modified: trunk/libass/ass_library.h
==============================================================================
--- trunk/libass/ass_library.h (original)
+++ trunk/libass/ass_library.h Wed Jan 30 00:25:11 2008
@@ -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 */
Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h (original)
+++ trunk/libass/ass_mp.h Wed Jan 30 00:25:11 2008
@@ -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 */
Modified: trunk/libass/ass_types.h
==============================================================================
--- trunk/libass/ass_types.h (original)
+++ trunk/libass/ass_types.h Wed Jan 30 00:25:11 2008
@@ -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 */
Modified: trunk/libass/ass_utils.h
==============================================================================
--- trunk/libass/ass_utils.h (original)
+++ trunk/libass/ass_utils.h Wed Jan 30 00:25:11 2008
@@ -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 */
Modified: trunk/libass/mputils.h
==============================================================================
--- trunk/libass/mputils.h (original)
+++ trunk/libass/mputils.h Wed Jan 30 00:25:11 2008
@@ -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 */
More information about the MPlayer-cvslog
mailing list