Commit 088e44e87773d612d2be6433697c17b3733ec4da
2006-08-22T14:24:30
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/ChangeLog b/ChangeLog
index bcdc5bf..f17623f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d52ff2f..12bbc2b 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 d8d6e2a..d471c2a 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 cc4ed89..9014d8f 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 );