--- firebird/src/common/config/config_file.cpp 2019-08-23 16:42:26.721439468 +0100
+++ firebird/src/common/config/config_file.cpp 2019-08-23 16:43:07.506579222 +0100
@@ -521,16 +521,14 @@
   unsigned code;
   const char* name;
  } dirs[] = {
-#define NMDIR(a) {Firebird::IConfigManager::a, "FB_"#a},
-  NMDIR(DIR_CONF)
-  NMDIR(DIR_SECDB)
-  NMDIR(DIR_PLUGINS)
-  NMDIR(DIR_UDF)
-  NMDIR(DIR_SAMPLE)
-  NMDIR(DIR_SAMPLEDB)
-  NMDIR(DIR_INTL)
-  NMDIR(DIR_MSG)
-#undef NMDIR
+  {Firebird::IConfigManager::DIR_CONF, "FB_dir_conf"},
+  {Firebird::IConfigManager::DIR_SECDB, "FB_dir_secdb"},
+  {Firebird::IConfigManager::DIR_PLUGINS, "FB_dir_plugins"},
+  {Firebird::IConfigManager::DIR_UDF, "FB_dir_udf"},
+  {Firebird::IConfigManager::DIR_SAMPLE, "FB_dir_sample"},
+  {Firebird::IConfigManager::DIR_SAMPLEDB, "FB_dir_sampledb"},
+  {Firebird::IConfigManager::DIR_INTL, "FB_dir_intl"},
+  {Firebird::IConfigManager::DIR_MSG, "FB_dir_msg"},
   {Firebird::IConfigManager::DIR_COUNT, NULL}
  };