Merge pull request PurpleI2P#860 from majestrate/fix-case-insensative…

…-include NetDb.h -> NetDb.hpp
vmlinuxer · Apr 22, 2017 · 81c2f4b · 81c2f4b
2 parents 2756f33 + e238f7e
commit 81c2f4b
Show file tree

Hide file tree

Showing 27 changed files with 27 additions and 27 deletions.
diff --git a/Win32/Win32App.cpp b/Win32/Win32App.cpp
@@ -3,7 +3,7 @@
 #include <shellapi.h>
 #include "ClientContext.h"
 #include "Config.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "Transports.h"
 #include "Tunnel.h"

diff --git a/Win32/i2pd.vcxproj b/Win32/i2pd.vcxproj
@@ -83,7 +83,7 @@
     <ClInclude Include="..\LittleBigEndian.h" />
     <ClInclude Include="..\Log.h" />
 	<ClInclude Include="..\NetDbRequests.h" />
-    <ClInclude Include="..\NetDb.h" />
+    <ClInclude Include="..\NetDb.hpp" />
     <ClInclude Include="..\NTCPSession.h" />
     <ClInclude Include="..\Queue.h" />
 	<ClInclude Include="..\Profiling.h" />

diff --git a/Win32/i2pd.vcxproj.filters b/Win32/i2pd.vcxproj.filters
@@ -158,7 +158,7 @@
     <ClInclude Include="..\Log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\NetDb.h">
+    <ClInclude Include="..\NetDb.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\NTCPSession.h">

diff --git a/daemon/Daemon.cpp b/daemon/Daemon.cpp
@@ -14,7 +14,7 @@
 #include "RouterContext.h"
 #include "Tunnel.h"
 #include "HTTP.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Garlic.h"
 #include "Streaming.h"
 #include "Destination.h"

diff --git a/daemon/HTTPServer.cpp b/daemon/HTTPServer.cpp
@@ -13,7 +13,7 @@
 #include "Tunnel.h"
 #include "TransitTunnel.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "HTTP.h"
 #include "LeaseSet.h"
 #include "Destination.h"

diff --git a/daemon/I2PControl.cpp b/daemon/I2PControl.cpp
@@ -17,7 +17,7 @@
 #include "FS.h"
 #include "Log.h"
 #include "Config.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "Daemon.h"
 #include "Tunnel.h"

diff --git a/daemon/UPnP.cpp b/daemon/UPnP.cpp
@@ -10,7 +10,7 @@
 
 #include "RouterContext.h"
 #include "UPnP.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "util.h"
 #include "RouterInfo.h"
 #include "Config.h"

diff --git a/libi2pd/Destination.cpp b/libi2pd/Destination.cpp
@@ -4,7 +4,7 @@
 #include "Log.h"
 #include "FS.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Destination.h"
 #include "util.h"
 

diff --git a/libi2pd/Destination.h b/libi2pd/Destination.h
@@ -17,7 +17,7 @@
 #include "Crypto.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Streaming.h"
 #include "Datagram.h"
 

diff --git a/libi2pd/I2NPProtocol.cpp b/libi2pd/I2NPProtocol.cpp
@@ -6,7 +6,7 @@
 #include "I2PEndian.h"
 #include "Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Tunnel.h"
 #include "Transports.h"
 #include "Garlic.h"

diff --git a/libi2pd/LeaseSet.cpp b/libi2pd/LeaseSet.cpp
@@ -3,7 +3,7 @@
 #include "Crypto.h"
 #include "Log.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Tunnel.h"
 #include "LeaseSet.h"
 

diff --git a/libi2pd/NTCPSession.cpp b/libi2pd/NTCPSession.cpp
@@ -10,7 +10,7 @@
 #include "I2NPProtocol.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "NTCPSession.h"
 #ifdef WITH_EVENTS
 #include "Event.h"

diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp
@@ -13,7 +13,7 @@
 #include "Transports.h"
 #include "RouterContext.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Config.h"
 
 using namespace i2p::transport;

diff --git a/libi2pd/NetDb.h → libi2pd/NetDb.hpp b/libi2pd/NetDb.h → libi2pd/NetDb.hpp
@@ -1,6 +1,6 @@
 #ifndef NETDB_H__
 #define NETDB_H__
-
+// this file is called NetDb.hpp to resolve conflict with libc's netdb.h on case insensitive fs
 #include <inttypes.h>
 #include <set>
 #include <map>

diff --git a/libi2pd/NetDbRequests.cpp b/libi2pd/NetDbRequests.cpp
@@ -1,7 +1,7 @@
 #include "Log.h"
 #include "I2NPProtocol.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "NetDbRequests.h"
 
 namespace i2p

diff --git a/libi2pd/Reseed.cpp b/libi2pd/Reseed.cpp
@@ -14,7 +14,7 @@
 #include "FS.h"
 #include "Log.h"
 #include "Identity.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "HTTP.h"
 #include "util.h"
 #include "Config.h"

diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
@@ -3,7 +3,7 @@
 #include "Crypto.h"
 #include "Timestamp.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "FS.h"
 #include "util.h"
 #include "version.h"

diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
@@ -12,7 +12,7 @@
 #include "Base.h"
 #include "Timestamp.h"
 #include "Log.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "RouterInfo.h"
 

diff --git a/libi2pd/SSU.cpp b/libi2pd/SSU.cpp
@@ -3,7 +3,7 @@
 #include "Log.h"
 #include "Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 
 namespace i2p

diff --git a/libi2pd/SSUData.cpp b/libi2pd/SSUData.cpp
@@ -2,7 +2,7 @@
 #include <boost/bind.hpp>
 #include "Log.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 #include "SSUData.h"
 #ifdef WITH_EVENTS

diff --git a/libi2pd/SSUSession.cpp b/libi2pd/SSUSession.cpp
@@ -4,7 +4,7 @@
 #include "Timestamp.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 #include "SSUSession.h"
 

diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
@@ -2,7 +2,7 @@
 #include "Crypto.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Transports.h"
 #include "Config.h"
 #ifdef WITH_EVENTS

diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
@@ -9,7 +9,7 @@
 #include "Timestamp.h"
 #include "I2NPProtocol.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Config.h"
 #include "Tunnel.h"
 #include "TunnelPool.h"

diff --git a/libi2pd/TunnelEndpoint.cpp b/libi2pd/TunnelEndpoint.cpp
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "Crypto.h"
 #include "Log.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "I2NPProtocol.h"
 #include "Transports.h"
 #include "RouterContext.h"

diff --git a/libi2pd/TunnelPool.cpp b/libi2pd/TunnelPool.cpp
@@ -2,7 +2,7 @@
 #include "I2PEndian.h"
 #include "Crypto.h"
 #include "Tunnel.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Timestamp.h"
 #include "Garlic.h"
 #include "Transports.h"

diff --git a/libi2pd/api.cpp b/libi2pd/api.cpp
@@ -2,7 +2,7 @@
 #include <map>
 #include "Config.h"
 #include "Log.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Transports.h"
 #include "Tunnel.h"
 #include "RouterContext.h"

diff --git a/libi2pd_client/AddressBook.cpp b/libi2pd_client/AddressBook.cpp
@@ -13,7 +13,7 @@
 #include "FS.h"
 #include "Log.h"
 #include "HTTP.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "ClientContext.h"
 #include "AddressBook.h"
 #include "Config.h"