Rename App/config.* to App/appconfig.*

App/config.cpp → App/appconfig.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "config.hpp"
+#include "appconfig.hpp"
 
 // The next line suppresses a deprecation warning within boost
 #define BOOST_BIND_GLOBAL_PLACEHOLDERS

App/net.cpp

@@ -1,6 +1,5 @@
 #include <iostream>
 
-#include "config.hpp"
 #include "net.hpp"
 
 // The command type byte values

App/net.hpp

@@ -9,7 +9,7 @@
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 
-#include "config.hpp"
+#include "appconfig.hpp"
 
 #define MAXCHUNKSIZE (65536+16)
 

App/teems.cpp

@@ -9,7 +9,7 @@
 #include "sgx_tcrypto.h"
 #include "sgx_tseal.h"
 #include "Untrusted.hpp"
-#include "config.hpp"
+#include "appconfig.hpp"
 #include "net.hpp"
 #include "start.hpp"
 

Makefile

@@ -282,10 +282,11 @@ depend:
 
 # DO NOT DELETE
 
-App/config.o: App/config.hpp
-App/net.o: App/config.hpp App/net.hpp
-App/start.o: App/start.hpp App/net.hpp App/config.hpp
-App/teems.o: Untrusted/Untrusted.hpp App/config.hpp App/net.hpp App/start.hpp
+App/appconfig.o: App/appconfig.hpp
+App/net.o: App/net.hpp App/appconfig.hpp
+App/start.o: App/start.hpp App/net.hpp App/appconfig.hpp
+App/teems.o: Untrusted/Untrusted.hpp App/appconfig.hpp App/net.hpp
+App/teems.o: App/start.hpp
 Untrusted/Untrusted.o: Untrusted/Untrusted.hpp Untrusted/Enclave_u.h
 
 Enclave/comms.o: Enclave/Enclave_t.h Enclave/utils.hpp