1 files changed, 13 insertions, 2 deletions
diff --git a/testbed/testcms2.c b/testbed/testcms2.c
index 13fd7fc..fd6c16c 100644
--- a/testbed/testcms2.c
+++ b/testbed/testcms2.c
@@ -75,8 +75,18 @@ static cmsUInt32Number SingleHit, MaxAllocated=0, TotalMemory=0;
 typedef struct { 
     cmsUInt32Number KeepSize;    
     cmsContext      WhoAllocated; 
-    cmsUInt32Number Align8_1;             // Some systems do need pointers aligned to 8-byte boundaries.
-    cmsUInt32Number Align8_2;        
+
+    union {
+        cmsUInt64Number HiSparc;
+
+        // '_cmsMemoryBlock' block is prepended by the
+        // allocator for any requested size. Thus, union holds
+        // "widest" type to guarantee proper '_cmsMemoryBlock'
+        // alignment for any requested size.
+
+    } alignment;
+
+   
 } _cmsMemoryBlock;
 
 #define SIZE_OF_MEM_HEADER (sizeof(_cmsMemoryBlock))
@@ -5975,6 +5985,7 @@ int CheckRGBPrimaries(void)
     cmsCIExyYTRIPLE tripxyY;
     cmsBool result;
 
+    cmsSetAdaptationState(0);
     hsRGB = cmsCreate_sRGBProfileTHR(DbgThread());
     if (!hsRGB) return 0;