commit c0f5b5d2d99255770fca06afb8b79f63db5728ea
author Tom Joseph <tomjoseph@in.ibm.com> Thu Feb 09 17:47:50 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Thu Feb 09 16:12:03 2017 +0000
tree 90139c708f7f3455431bcc3a87eb857a3e62949d
parent 1efcb493a85a5d268c59f73a25f11aff8bf1ca5e

Fix compilation errors for x86-64 SDK

Change-Id: Ia515f3bb6687a1bfc1c37fb33e37602ab9d91950
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 0248c39..a16ddc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@
 
 # Checks for header files.
 AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd developement package required])])
+AC_CHECK_HEADER(host-ipmid/ipmid-api.h, ,[AC_MSG_ERROR([Could not find host-ipmid/ipmid-api.h...openbmc/phosphor-host-ipmid package required])])
 
 # Checks for library functions.
 LT_INIT([dlopen disable-static shared])

message_parsers.cpp

diff --git a/message_parsers.cpp b/message_parsers.cpp
index 0e58495..f63282e 100644
--- a/message_parsers.cpp
+++ b/message_parsers.cpp
@@ -198,7 +198,7 @@
     internal::addSequenceNumber(packet, session);
 
     // Add Payload
-    header->payloadLength = endian::to_ipmi(outMessage.payload.size());
+    header->payloadLength = endian::to_ipmi<uint16_t>(outMessage.payload.size());
     // Insert the Payload into the Packet
     packet.insert(packet.end(), outMessage.payload.begin(),
                   outMessage.payload.end());

socket_channel.cpp

diff --git a/socket_channel.cpp b/socket_channel.cpp
index a29ef8d..fa5c882 100644
--- a/socket_channel.cpp
+++ b/socket_channel.cpp
@@ -37,7 +37,7 @@
     auto bufferSize = outBuffer.size();
     auto outputPtr = outBuffer.data();
 
-    address.addrSize = sizeof(address.inAddr);
+    address.addrSize = static_cast<socklen_t>(sizeof(address.inAddr));
 
     do
     {
@@ -98,7 +98,8 @@
         {
             if (FD_ISSET(sockfd, &writeSet))
             {
-                address.addrSize = sizeof(address.inAddr);
+                address.addrSize =
+                        static_cast<socklen_t>(sizeof(address.inAddr));
                 do
                 {
                     writeDataLen = sendto(sockfd,           // File Descriptor

socket_channel.hpp

diff --git a/socket_channel.hpp b/socket_channel.hpp
index d5f140e..2bc7a33 100644
--- a/socket_channel.hpp
+++ b/socket_channel.hpp
@@ -26,7 +26,7 @@
                 sockaddr sockAddr;
                 sockaddr_in6 inAddr;
             };
-            size_t addrSize;
+            socklen_t addrSize;
         };
 
         /**