Moved defines.hpp to the project root

indexer/data_header_reader.cpp

@@ -3,7 +3,7 @@
 #include "data_header_reader.hpp"
 #include "data_header.hpp"
 
-#include "../storage/defines.hpp"
+#include "../defines.hpp"
 
 #include "../coding/file_container.hpp"
 

indexer/feature.cpp

@@ -5,7 +5,7 @@
 #include "feature_visibility.hpp"
 #include "scales.hpp"
 
-#include "../storage/defines.hpp" // just for file extensions
+#include "../defines.hpp" // just for file extensions
 
 #include "../geometry/rect2d.hpp"
 

indexer/features_vector.hpp

@@ -2,7 +2,7 @@
 #include "feature.hpp"
 #include "data_header_reader.hpp"
 
-#include "../storage/defines.hpp"
+#include "../defines.hpp"
 
 #include "../coding/var_record_reader.hpp"
 

indexer/index.hpp

@@ -5,7 +5,7 @@
 #include "scale_index.hpp"
 #include "scales.hpp"
 
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../geometry/rect2d.hpp"
 

indexer/index_builder.cpp

@@ -2,7 +2,7 @@
 #include "data_header_reader.hpp"
 #include "features_vector.hpp"
 
-#include "../storage/defines.hpp"
+#include "../defines.hpp"
 
 #include "../coding/file_container.hpp"
 

indexer/indexer_tests/feature_routine.cpp

@@ -2,7 +2,7 @@
 
 #include "feature_routine.hpp"
 
-#include "../../storage/defines.hpp" // just for file extensions
+#include "../../defines.hpp" // just for file extensions
 
 #include "../feature_impl.hpp"
 

indexer/indexer_tests/index_builder_test.cpp

@@ -5,7 +5,7 @@
 #include "../classif_routine.hpp"
 #include "../features_vector.hpp"
 #include "../data_header_reader.hpp"
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 #include "../../platform/platform.hpp"
 #include "../../coding/file_container.hpp"
 #include "../../base/stl_add.hpp"

indexer/indexer_tool/feature_bucketer.hpp

@@ -8,7 +8,7 @@
 
 #include "../../indexer/feature.hpp"
 #include "../../indexer/feature_visibility.hpp"
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../std/string.hpp"
 

indexer/indexer_tool/feature_generator.cpp

@@ -4,7 +4,7 @@
 #include "osm_element.hpp"
 #include "polygonizer.hpp"
 
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../indexer/data_header.hpp"
 #include "../../indexer/osm_decl.hpp"

indexer/indexer_tool/feature_sorter.cpp

@@ -1,7 +1,7 @@
 #include "feature_sorter.hpp"
 #include "feature_generator.hpp"
 
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../indexer/data_header.hpp"
 #include "../../indexer/feature_processor.hpp"

indexer/indexer_tool/indexer_tool.cpp

@@ -12,7 +12,7 @@
 #include "../osm_decl.hpp"
 #include "../data_header.hpp"
 
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../platform/platform.hpp"
 

indexer/indexer_tool/update_generator.cpp

@@ -7,7 +7,7 @@
 #include "../../platform/platform.hpp"
 
 #include "../../storage/country.hpp"
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../base/string_utils.hpp"
 #include "../../base/logging.hpp"

omim.pro

@@ -3,6 +3,8 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
+HEADERS += defines.hpp
+
 # desktop projects
 win32|macx|unix {
 SUBDIRS = 3party \

platform/platform_tests/platform_test.cpp

@@ -2,7 +2,7 @@
 
 #include "../platform.hpp"
 
-#include "../../storage/defines.hpp"
+#include "../../defines.hpp"
 
 #include "../../std/stdio.hpp"
 

storage/country.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "defines.hpp"
+#include "../defines.hpp"
 #include "simple_tree.hpp"
 
 #include "../geometry/rect2d.hpp"

storage/storage.hpp

@@ -3,7 +3,7 @@
 #include "../platform/download_manager.hpp"
 #include "../platform/platform.hpp"
 
-#include "../storage/defines.hpp"
+#include "../defines.hpp"
 #include "../storage/country.hpp"
 
 #include "../std/vector.hpp"

storage/storage.pro

@@ -12,7 +12,6 @@ include($$ROOT_DIR/common.pri)
 
 HEADERS += \
   country.hpp \
-  defines.hpp \
   simple_tree.hpp \
   storage.hpp \