Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/base/windows/src/time.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Windows.h>
// sys/time.h includes WinSock2.h. It must come before Windows.h, which
// otherwise includes the older winsock.h and the two conflict.
#include <sys/time.h>
#include <Windows.h>
#include <time.h>

#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion host/vulkan/vk_common_operations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading