From e5ef9be20d0ed0717e3a4bd203cd684cad1d8834 Mon Sep 17 00:00:00 2001 From: Aleksey Sanin Date: Tue, 9 Jul 2024 12:40:37 -0400 Subject: [PATCH 1/3] (xmlsec-core) Remove 'const struct' to avoid problems with some compilers --- include/xmlsec/keysdata.h | 4 ++-- include/xmlsec/keysmngr.h | 4 ++-- include/xmlsec/list.h | 2 +- include/xmlsec/transforms.h | 2 +- src/kw_aes_des.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/xmlsec/keysdata.h b/include/xmlsec/keysdata.h index 03064e390..42d0909c1 100644 --- a/include/xmlsec/keysdata.h +++ b/include/xmlsec/keysdata.h @@ -27,9 +27,9 @@ extern "C" { * Forward declarations * ****************************************************************************/ -typedef const struct _xmlSecKeyDataKlass xmlSecKeyDataKlass, +typedef struct _xmlSecKeyDataKlass xmlSecKeyDataKlass, *xmlSecKeyDataId; -typedef const struct _xmlSecKeyDataStoreKlass xmlSecKeyDataStoreKlass, +typedef struct _xmlSecKeyDataStoreKlass xmlSecKeyDataStoreKlass, *xmlSecKeyDataStoreId; typedef struct _xmlSecKeyDataList xmlSecKeyDataList, *xmlSecKeyDataListPtr; diff --git a/include/xmlsec/keysmngr.h b/include/xmlsec/keysmngr.h index 9de87f7b1..4773bf684 100644 --- a/include/xmlsec/keysmngr.h +++ b/include/xmlsec/keysmngr.h @@ -22,9 +22,9 @@ extern "C" { #endif /* __cplusplus */ -typedef const struct _xmlSecKeyKlass xmlSecKeyKlass, +typedef struct _xmlSecKeyKlass xmlSecKeyKlass, *xmlSecKeyId; -typedef const struct _xmlSecKeyStoreKlass xmlSecKeyStoreKlass, +typedef struct _xmlSecKeyStoreKlass xmlSecKeyStoreKlass, *xmlSecKeyStoreId; typedef struct _xmlSecKeyX509DataValue xmlSecKeyX509DataValue, diff --git a/include/xmlsec/list.h b/include/xmlsec/list.h index 5b747c26e..d7d17ebbc 100644 --- a/include/xmlsec/list.h +++ b/include/xmlsec/list.h @@ -19,7 +19,7 @@ extern "C" { #endif /* __cplusplus */ -typedef const struct _xmlSecPtrListKlass xmlSecPtrListKlass, +typedef struct _xmlSecPtrListKlass xmlSecPtrListKlass, *xmlSecPtrListId; typedef struct _xmlSecPtrList xmlSecPtrList, *xmlSecPtrListPtr; diff --git a/include/xmlsec/transforms.h b/include/xmlsec/transforms.h index 5e0499960..7edae7cbc 100644 --- a/include/xmlsec/transforms.h +++ b/include/xmlsec/transforms.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -typedef const struct _xmlSecTransformKlass xmlSecTransformKlass, +typedef struct _xmlSecTransformKlass xmlSecTransformKlass, *xmlSecTransformId; /********************************************************************** diff --git a/src/kw_aes_des.h b/src/kw_aes_des.h index 65823833b..f8f93cee3 100644 --- a/src/kw_aes_des.h +++ b/src/kw_aes_des.h @@ -76,7 +76,7 @@ struct _xmlSecKWDes3Klass { void* reserved0; void* reserved1; }; -typedef const struct _xmlSecKWDes3Klass xmlSecKWDes3Klass, +typedef struct _xmlSecKWDes3Klass xmlSecKWDes3Klass, *xmlSecKWDes3Id; #define xmlSecKWDes3CheckId(id) \ @@ -156,7 +156,7 @@ struct _xmlSecKWAesKlass { void* reserved0; void* reserved1; }; -typedef const struct _xmlSecKWAesKlass xmlSecKWAesKlass, +typedef struct _xmlSecKWAesKlass xmlSecKWAesKlass, *xmlSecKWAesId; /********************************************************************* From 107a7081f9fbcbe8a1a9f5c6182985593e7cad7a Mon Sep 17 00:00:00 2001 From: Aleksey Sanin Date: Tue, 9 Jul 2024 12:43:29 -0400 Subject: [PATCH 2/3] Fix spaces --- include/xmlsec/keysdata.h | 4 ++-- include/xmlsec/keysmngr.h | 4 ++-- include/xmlsec/list.h | 2 +- include/xmlsec/transforms.h | 2 +- src/kw_aes_des.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/xmlsec/keysdata.h b/include/xmlsec/keysdata.h index 42d0909c1..ce8c715af 100644 --- a/include/xmlsec/keysdata.h +++ b/include/xmlsec/keysdata.h @@ -27,9 +27,9 @@ extern "C" { * Forward declarations * ****************************************************************************/ -typedef struct _xmlSecKeyDataKlass xmlSecKeyDataKlass, +typedef struct _xmlSecKeyDataKlass xmlSecKeyDataKlass, *xmlSecKeyDataId; -typedef struct _xmlSecKeyDataStoreKlass xmlSecKeyDataStoreKlass, +typedef struct _xmlSecKeyDataStoreKlass xmlSecKeyDataStoreKlass, *xmlSecKeyDataStoreId; typedef struct _xmlSecKeyDataList xmlSecKeyDataList, *xmlSecKeyDataListPtr; diff --git a/include/xmlsec/keysmngr.h b/include/xmlsec/keysmngr.h index 4773bf684..9864f3662 100644 --- a/include/xmlsec/keysmngr.h +++ b/include/xmlsec/keysmngr.h @@ -22,9 +22,9 @@ extern "C" { #endif /* __cplusplus */ -typedef struct _xmlSecKeyKlass xmlSecKeyKlass, +typedef struct _xmlSecKeyKlass xmlSecKeyKlass, *xmlSecKeyId; -typedef struct _xmlSecKeyStoreKlass xmlSecKeyStoreKlass, +typedef struct _xmlSecKeyStoreKlass xmlSecKeyStoreKlass, *xmlSecKeyStoreId; typedef struct _xmlSecKeyX509DataValue xmlSecKeyX509DataValue, diff --git a/include/xmlsec/list.h b/include/xmlsec/list.h index d7d17ebbc..6f3372f10 100644 --- a/include/xmlsec/list.h +++ b/include/xmlsec/list.h @@ -19,7 +19,7 @@ extern "C" { #endif /* __cplusplus */ -typedef struct _xmlSecPtrListKlass xmlSecPtrListKlass, +typedef struct _xmlSecPtrListKlass xmlSecPtrListKlass, *xmlSecPtrListId; typedef struct _xmlSecPtrList xmlSecPtrList, *xmlSecPtrListPtr; diff --git a/include/xmlsec/transforms.h b/include/xmlsec/transforms.h index 7edae7cbc..e81966f42 100644 --- a/include/xmlsec/transforms.h +++ b/include/xmlsec/transforms.h @@ -29,7 +29,7 @@ extern "C" { #endif /* __cplusplus */ -typedef struct _xmlSecTransformKlass xmlSecTransformKlass, +typedef struct _xmlSecTransformKlass xmlSecTransformKlass, *xmlSecTransformId; /********************************************************************** diff --git a/src/kw_aes_des.h b/src/kw_aes_des.h index f8f93cee3..13e113ac9 100644 --- a/src/kw_aes_des.h +++ b/src/kw_aes_des.h @@ -76,7 +76,7 @@ struct _xmlSecKWDes3Klass { void* reserved0; void* reserved1; }; -typedef struct _xmlSecKWDes3Klass xmlSecKWDes3Klass, +typedef struct _xmlSecKWDes3Klass xmlSecKWDes3Klass, *xmlSecKWDes3Id; #define xmlSecKWDes3CheckId(id) \ From 9e75c44cf7f8db1e026d67f6facd5d1c8520a188 Mon Sep 17 00:00:00 2001 From: Aleksey Sanin Date: Tue, 9 Jul 2024 12:44:14 -0400 Subject: [PATCH 3/3] Fix spaces --- src/kw_aes_des.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kw_aes_des.h b/src/kw_aes_des.h index 13e113ac9..514b76904 100644 --- a/src/kw_aes_des.h +++ b/src/kw_aes_des.h @@ -156,7 +156,7 @@ struct _xmlSecKWAesKlass { void* reserved0; void* reserved1; }; -typedef struct _xmlSecKWAesKlass xmlSecKWAesKlass, +typedef struct _xmlSecKWAesKlass xmlSecKWAesKlass, *xmlSecKWAesId; /*********************************************************************