diff options
| author | Jens Claudius <jens.claudius@yahoo.com> | 2006-08-22 14:24:30 +0000 |
|---|---|---|
| committer | Jens Claudius <jens.claudius@yahoo.com> | 2006-08-22 14:24:30 +0000 |
| commit | 088e44e87773d612d2be6433697c17b3733ec4da (patch) | |
| tree | 12b5a3790145319bc5a7c44a37c93150a0927558 | |
| parent | 123429962025b376145a2541cc9b980722ad1440 (diff) | |
| download | freetype2-088e44e87773d612d2be6433697c17b3733ec4da.tar.gz | |
2006-08-22 Jens Claudius <jens.claudius@yahoo.com>
Fix for previous commit, which caused many compiler warnings/errors
about addresses of volatile objects passed as function arguments
as non-volatile pointers.
* freetype2/include/freetype/internal/ftvalid.h: Make
FT_Validator typedef a pointer to a volatile object.
* freetype2/src/gxvalid/gxvmod.c (gxv_load_table): Make function
argument `table' a pointer to a volatile object.
* freetype2/src/otvalid/otvmod.c (otv_load_table): Make function
argument `table' a pointer to a volatile object.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | include/freetype/internal/ftvalid.h | 2 | ||||
| -rw-r--r-- | src/gxvalid/gxvmod.c | 8 | ||||
| -rw-r--r-- | src/otvalid/otvmod.c | 8 |
4 files changed, 24 insertions, 9 deletions
@@ -1,3 +1,18 @@ +2006-08-22 Jens Claudius <jens.claudius@yahoo.com> + Fix for previous commit, which caused many compiler warnings/errors + about addresses of volatile objects passed as function arguments + as non-volatile pointers. + + + * freetype2/include/freetype/internal/ftvalid.h: Make + FT_Validator typedef a pointer to a volatile object. + + * freetype2/src/gxvalid/gxvmod.c (gxv_load_table): Make function + argument `table' a pointer to a volatile object. + + * freetype2/src/otvalid/otvmod.c (otv_load_table): Make function + argument `table' a pointer to a volatile object. + 2006-08-18 Jens Claudius <jens.claudius@yahoo.com> * freetype2/src/gxvalid/gxvmod.c (GXV_TABLE_DECL): Mark local diff --git a/include/freetype/internal/ftvalid.h b/include/freetype/internal/ftvalid.h index d52ff2f3b..12bbc2b41 100644 --- a/include/freetype/internal/ftvalid.h +++ b/include/freetype/internal/ftvalid.h @@ -39,7 +39,7 @@ FT_BEGIN_HEADER /*************************************************************************/ /* handle to a validation object */ - typedef struct FT_ValidatorRec_* FT_Validator; + typedef struct FT_ValidatorRec_ volatile* FT_Validator; /*************************************************************************/ diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c index d8d6e2a06..d471c2ac0 100644 --- a/src/gxvalid/gxvmod.c +++ b/src/gxvalid/gxvmod.c @@ -48,10 +48,10 @@ static FT_Error - gxv_load_table( FT_Face face, - FT_Tag tag, - FT_Byte** table, - FT_ULong* table_len ) + gxv_load_table( FT_Face face, + FT_Tag tag, + FT_Byte* volatile* table, + FT_ULong* table_len ) { FT_Error error; FT_Memory memory = FT_FACE_MEMORY( face ); diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c index cc4ed89d1..9014d8fe8 100644 --- a/src/otvalid/otvmod.c +++ b/src/otvalid/otvmod.c @@ -39,10 +39,10 @@ static FT_Error - otv_load_table( FT_Face face, - FT_Tag tag, - FT_Byte* *table, - FT_ULong *table_len ) + otv_load_table( FT_Face face, + FT_Tag tag, + FT_Byte* volatile* table, + FT_ULong* table_len ) { FT_Error error; FT_Memory memory = FT_FACE_MEMORY( face ); |