PR feedback

Author: andrurogerz

stdlib/public/runtime/EnvironmentVariables.cpp

@@ -195,16 +195,14 @@ extern "C" char **_environ;
 // On Android, also try loading runtime debug env variables from system props.
 static void platformInitialize(void *context) {
   (void)context;
-#define SYSPROP_PREFIX "debug.swift.runtime."
-#define VARIABLE(name, type, defaultValue, help)                          \
-  do {                                                                    \
-    char name##_string[PROP_VALUE_MAX] = "";                              \
-    if (__system_property_get(SYSPROP_PREFIX #name, name##_string) > 0) { \
-      swift::runtime::environment::name##_isSet_variable = true;          \
-      swift::runtime::environment::name##_variable =                      \
-        parse_##type(#name, name##_string, defaultValue);                 \
-    }                                                                     \
-  } while (0);
+  char propValueString[PROP_VALUE_MAX] = "";
+#define SYSPROP_PREFIX "debug.org.swift.runtime."
+#define VARIABLE(name, type, defaultValue, help)                      \
+  if (__system_property_get(SYSPROP_PREFIX #name, propValueString)) { \
+    swift::runtime::environment::name##_isSet_variable = true;        \
+    swift::runtime::environment::name##_variable =                    \
+        parse_##type(#name, propValueString, defaultValue);           \
+  }
 #include "EnvironmentVariables.def"
 #undef VARIABLE
 }