Fix the include paths for storagedir,conffile (automated)

diff --git a/src/or/config.c b/src/or/config.c
index b0141b9c0e0f9c86747c9b17f2aa08a7fc7f3d22..bdc963a86f01b150b646aebe565a459eaa287b63 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -111,7 +111,7 @@
 #include <shlobj.h>
 #endif
 
-#include "common/conffile.h"
+#include "lib/fs/conffile.h"
 #include "common/procmon.h"
 
 #include "or/dirauth/dirvote.h"

diff --git a/src/or/conscache.c b/src/or/conscache.c
index 63ff0db787c1807e630fb0f591661d7df233b5dd..bc3a09509d3e91b2db5f2364fb12cb8efb3adfdc 100644 (file)
--- a/src/or/conscache.c
+++ b/src/or/conscache.c
@@ -6,7 +6,7 @@
 #include "or/config.h"
 #include "or/conscache.h"
 #include "lib/crypt_ops/crypto_util.h"
-#include "common/storagedir.h"
+#include "lib/fs/storagedir.h"
 
 #define CCE_MAGIC 0x17162253
 

diff --git a/src/test/test_config.c b/src/test/test_config.c
index dcdaa2ed598cf8004dafa8c803fc4dcc5994fe0d..4676cc89743d6dc9945a6ad0742d85dead052bdd 100644 (file)
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -48,7 +48,7 @@
 #include "or/port_cfg_st.h"
 #include "or/routerinfo_st.h"
 
-#include "common/conffile.h"
+#include "lib/fs/conffile.h"
 
 static void
 test_config_addressmap(void *arg)

diff --git a/src/test/test_storagedir.c b/src/test/test_storagedir.c
index 4dd7673521f79edf5ad879d69d23138628115ddb..d07d35e0966721e59ca836c01b4135926da22143 100644 (file)
--- a/src/test/test_storagedir.c
+++ b/src/test/test_storagedir.c
@@ -3,7 +3,7 @@
 
 #include "or/or.h"
 #include "lib/crypt_ops/crypto_rand.h"
-#include "common/storagedir.h"
+#include "lib/fs/storagedir.h"
 #include "test/test.h"
 
 #ifdef HAVE_UTIME_H