diff --git a/hyperpoint.cpp b/hyperpoint.cpp
index 55d9f042..30f90496 100644
--- a/hyperpoint.cpp
+++ b/hyperpoint.cpp
@@ -47,14 +47,21 @@ eVariation variation;
 struct hyperpoint : array<ld, MAXMDIM> {
   hyperpoint() {}
   
+  #if ISGCC46
   #if MAXMDIM == 4
-  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { ONLY_GCC46((array<ld, MAXMDIM>)) {x, y, z, w}} { 
+  // aaa
+  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { (array<ld, MAXMDIM>) {{x, y, z, w}}} {}
   #else
-  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { ONLY_GCC46((array<ld, MAXMDIM>)) {x, y, z}} { 
+  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> { (array<ld, MAXMDIM>) {{x, y, z}}} {}
+  #endif
+
+  #else
+  #if MAXMDIM == 4
+  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> {{x,y,z,w}} {}
+  #else
+  constexpr hyperpoint(ld x, ld y, ld z, ld w) : array<ld, MAXMDIM> {{x,y,z}} {}
+  #endif
   #endif
-    // self[0] = x; self[1] = y; self[2] = z; 
-    // if(MAXMDIM == 4) self[3] = w;
-    }
 
   inline hyperpoint& operator *= (ld d) {
     for(int i=0; i<MDIM; i++) self[i] *= d;
diff --git a/savemem.cpp b/savemem.cpp
index 675eb1bb..f84d927a 100644
--- a/savemem.cpp
+++ b/savemem.cpp
@@ -216,7 +216,7 @@ EX void apply_memory_reserve() {
       }
     }
   catch(std::bad_alloc&) {}
-  #if ((ISLINUX && ISSTEAM) || ISWINDOWS)
+  #if (ISGCC46 || ISWINDOWS)
   // no get_new_handler on this compiler...
   default_handler = [] { throw std::bad_alloc(); };
   #else
diff --git a/sysconfig.h b/sysconfig.h
index 95a24f96..cd4dc987 100644
--- a/sysconfig.h
+++ b/sysconfig.h
@@ -49,9 +49,9 @@
 
 #if GCC46
 #define override
-#define ONLY_GCC46(x) x
+#define ISGCC46 1
 #else
-#define ONLY_GCC46(x)
+#define ISGCC46 0
 #endif
 
 #ifndef ISWEB