Blob Blame History Raw
Patch by Robert Scheck <robert@fedoraproject.org> for dislocker >= 0.5.1 to replace the C++11 syntax with
_Static_assert() by something more GCC 4.1.x compatible; see: https://github.com/Aorimn/dislocker/pull/58

--- dislocker-0.5.1/include/dislocker/metadata/datums.h			2016-01-03 16:55:16.000000000 +0100
+++ dislocker-0.5.1/include/dislocker/metadata/datums.h.assert		2016-01-06 03:43:47.000000000 +0100
@@ -32,6 +32,11 @@
 #include "dislocker/ntfs/encoding.h"
 #include "dislocker/encryption/encommon.h"
 
+#include <assert.h>
+
+#ifndef static_assert
+#define static_assert(x, s) extern int static_assertion[2*!!(x)-1]
+#endif
 
 
 /**
@@ -102,7 +107,7 @@
 	uint16_t error_status;
 } datum_header_safe_t;
 
-_Static_assert(
+static_assert(
 	sizeof(struct _header_safe) == 8,
 	"Datum header structure's size isn't equal to 8"
 );
--- dislocker-0.5.1/include/dislocker/metadata/metadata.priv.h		2016-01-03 16:55:16.000000000 +0100
+++ dislocker-0.5.1/include/dislocker/metadata/metadata.priv.h.assert	2016-01-06 03:44:16.000000000 +0100
@@ -40,6 +40,12 @@
 		}                                                                   \
 	} while(0);
 
+#include <assert.h>
+
+#ifndef static_assert
+#define static_assert(x, s) extern int static_assertion[2*!!(x)-1]
+#endif
+
 
 
 #pragma pack (1)
@@ -100,7 +106,7 @@
 	uint16_t boot_partition_identifier; // = 0xaa55                                 -- offset 0x1fe
 } volume_header_t; // Size = 512
 
-_Static_assert(
+static_assert(
 	sizeof(struct _volume_header) == 512,
 	"Volume header structure's size isn't equal to 512"
 );
@@ -123,7 +129,7 @@
 	ntfs_time_t timestamp; //                      -- offset 0x28
 } bitlocker_dataset_t; // Size = 0x30
 
-_Static_assert(
+static_assert(
 	sizeof(struct _bitlocker_dataset) == 0x30,
 	"BitLocker dataset structure's size isn't equal to 0x30"
 );
@@ -176,7 +182,7 @@
 	struct _bitlocker_dataset dataset; // See above                                         -- offset 0x40
 } bitlocker_information_t; // Size = 0x40 + 0x30
 
-_Static_assert(
+static_assert(
 	sizeof(struct _bitlocker_information) == (0x40 + 0x30),
 	"BitLocker information structure's size isn't equal to 0x70"
 );
@@ -199,7 +205,7 @@
 	uint32_t  crc32;
 } bitlocker_validations_t; // Size = 8
 
-_Static_assert(
+static_assert(
 	sizeof(struct _bitlocker_validations) == 8,
 	"BitLocker validations structure's size isn't equal to 8"
 );
@@ -227,7 +233,7 @@
 	uint64_t disk_offsets[2]; //                                                -- offset 0x28
 } bitlocker_eow_infos_t; // Size = 0x38
 
-_Static_assert(
+static_assert(
 	sizeof(struct _bitlocker_eow_infos) == 0x38,
 	"BitLocker EOW information structure's size isn't equal to 0x38"
 );