$OpenBSD$

Index: Externals/cximage/ximainfo.cpp
--- Externals/cximage/ximainfo.cpp.orig
+++ Externals/cximage/ximainfo.cpp
@@ -721,13 +721,13 @@ CxImage * CxImage::GetFrame(long nFrame) const
 	return ppFrames[nFrame];
 }
 ////////////////////////////////////////////////////////////////////////////////
-short CxImage::ntohs(const short word)
+short CxImage::m_ntohs(const short word)
 {
 	if (info.bLittleEndianHost) return word;
 	return ( (word & 0xff) << 8 ) | ( (word >> 8) & 0xff );
 }
 ////////////////////////////////////////////////////////////////////////////////
-long CxImage::ntohl(const long dword)
+long CxImage::m_ntohl(const long dword)
 {
 	if (info.bLittleEndianHost) return dword;
 	return  ((dword & 0xff) << 24 ) | ((dword & 0xff00) << 8 ) |
@@ -736,17 +736,17 @@ long CxImage::ntohl(const long dword)
 ////////////////////////////////////////////////////////////////////////////////
 void CxImage::bihtoh(BITMAPINFOHEADER* bih)
 {
-	bih->biSize = ntohl(bih->biSize);
-	bih->biWidth = ntohl(bih->biWidth);
-	bih->biHeight = ntohl(bih->biHeight);
-	bih->biPlanes = ntohs(bih->biPlanes);
-	bih->biBitCount = ntohs(bih->biBitCount);
-	bih->biCompression = ntohl(bih->biCompression);
-	bih->biSizeImage = ntohl(bih->biSizeImage);
-	bih->biXPelsPerMeter = ntohl(bih->biXPelsPerMeter);
-	bih->biYPelsPerMeter = ntohl(bih->biYPelsPerMeter);
-	bih->biClrUsed = ntohl(bih->biClrUsed);
-	bih->biClrImportant = ntohl(bih->biClrImportant);
+	bih->biSize = m_ntohl(bih->biSize);
+	bih->biWidth = m_ntohl(bih->biWidth);
+	bih->biHeight = m_ntohl(bih->biHeight);
+	bih->biPlanes = m_ntohs(bih->biPlanes);
+	bih->biBitCount = m_ntohs(bih->biBitCount);
+	bih->biCompression = m_ntohl(bih->biCompression);
+	bih->biSizeImage = m_ntohl(bih->biSizeImage);
+	bih->biXPelsPerMeter = m_ntohl(bih->biXPelsPerMeter);
+	bih->biYPelsPerMeter = m_ntohl(bih->biYPelsPerMeter);
+	bih->biClrUsed = m_ntohl(bih->biClrUsed);
+	bih->biClrImportant = m_ntohl(bih->biClrImportant);
 }
 ////////////////////////////////////////////////////////////////////////////////
 /**
