resolve collision with pre-processsor makro

inphos42 · Jul 15, 2016 · 85718e1 · 85718e1
1 parent d6dd3ce
commit 85718e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/osmpbf/blobfile.cpp b/osmpbf/blobfile.cpp
@@ -228,7 +228,7 @@ void BlobFileIn::readBlobHeader(uint32_t & blobLength, osmpbf::BlobDataType & bl
 
 	if (m_VerboseOutput) std::cout << "checking blob header ..." << std::endl;
 
-	uint32_t headerLength = osmpbf::ntohl(* (uint32_t *) fileData());
+	uint32_t headerLength = osmpbf::net2hostLong(* (uint32_t *) fileData());
 
 	if (m_VerboseOutput) std::cout << "header length : " << headerLength << " B" << std::endl;
 
@@ -527,7 +527,7 @@ bool BlobFileOut::writeBlob(osmpbf::BlobDataType type, const char * buffer, uint
 
 	// write header size
 	uint32_t headerSize = blobHeader->ByteSize();
-	headerSize = osmpbf::htonl(headerSize);
+	headerSize = osmpbf::host2NetLong(headerSize);
 	osmpbf::lseek(m_FileDescriptor, headerSizePosition, IO_SEEK_SET);
 	osmpbf::write(m_FileDescriptor, &headerSize, sizeof(uint32_t));
 	osmpbf::lseek(m_FileDescriptor, blobPosition, IO_SEEK_SET);

diff --git a/osmpbf/include/osmpbf/net.h b/osmpbf/include/osmpbf/net.h
@@ -6,8 +6,9 @@
 
 namespace osmpbf {
 
-uint32_t ntohl(uint32_t v);
-uint32_t htonl(uint32_t v);
+uint32_t net2hostLong(uint32_t v);
+
+uint32_t host2NetLong(uint32_t v);
 
 }//end namespace osmpbf
 

diff --git a/osmpbf/net.cpp b/osmpbf/net.cpp
@@ -10,11 +10,11 @@
 
 namespace osmpbf {
 
-uint32_t ntohl(uint32_t v) {
+uint32_t net2hostLong(uint32_t v) {
 	return ::ntohl(v);
 }
 
-uint32_t htonl(uint32_t v) {
+uint32_t host2NetLong(uint32_t v) {
 	return ::htonl(v);
 }