diff --git a/common/base/windows/src/time.cpp b/common/base/windows/src/time.cpp index 25412bdae..f25e2714a 100644 --- a/common/base/windows/src/time.cpp +++ b/common/base/windows/src/time.cpp @@ -12,8 +12,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include +// sys/time.h includes WinSock2.h. It must come before Windows.h, which +// otherwise includes the older winsock.h and the two conflict. #include +#include #include #include diff --git a/host/vulkan/vk_common_operations.cpp b/host/vulkan/vk_common_operations.cpp index 71eccae2c..0fd827227 100644 --- a/host/vulkan/vk_common_operations.cpp +++ b/host/vulkan/vk_common_operations.cpp @@ -1945,7 +1945,7 @@ void VkEmulation::setFeatures(const gfxstream::host::FeatureSet& features) { "Ensure host allocations are aligned to " "avoid VMM errors when mapping."); GFXSTREAM_INFO("Enabling VulkanAllocateHostMemory: %s", - mFeatures.VulkanAllocateHostMemory.getReason()); + mFeatures.VulkanAllocateHostMemory.getReason().c_str()); } } #endif