Fix faulty merge

doc/ReleaseNotes

@@ -54,6 +54,7 @@ This issue fixes several bugs that were still found in 1.9.2.
 * Now also compiles on older Linux distros (eg. CentOS 5 / manylinux1)
 * get_keyboard_map now includes keys on layouts with special characters
 * Fix crash due to incorrect alignment when compiling Eigen with AVX
+* Fix crash when writing 16-bit .tif file (now silently downsamples)
 
 ------------------------  RELEASE 1.9.2  ------------------------
 
@@ -78,7 +79,6 @@ remained in the 1.9.1 release, including:
 * Fix constant reloading of texture when gl-ignore-mipmaps is set
 * BamReader now releases the GIL (so it can be used threaded)
 * Fix AttributeError in direct.stdpy.threading module
-* Fix crash when writing 16-bit .tif file (now silently downsamples)
 
 ------------------------  RELEASE 1.9.1  ------------------------
 

dtool/src/dtoolbase/memoryHook.I

@@ -70,12 +70,11 @@ get_header_reserved_bytes() {
 #ifdef LINMATH_ALIGN
   // If we're doing SSE2 alignment, we must reserve a full 16-byte block,
   // since anything less than that will spoil the alignment.
-  static const size_t header_reserved_bytes = 16;
 #ifdef __AVX__
   // Eigen requires 32-byte alignment when using AVX instructions.
-  const size_t header_reserved_bytes = 32;
+  static const size_t header_reserved_bytes = 32;
 #else
-  const size_t header_reserved_bytes = 16;
+  static const size_t header_reserved_bytes = 16;
 #endif
 
 #elif defined(MEMORY_HOOK_DO_ALIGN)