From 147cc6b685384d95515205b9e2ac1400c27e3d4f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 21 Nov 2015 15:39:30 +0100 Subject: Fix includes. --- plugingui/image.cc | 5 +++-- plugingui/nativewindow_win32.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugingui/image.cc b/plugingui/image.cc index 52c5c9f..3cefbb3 100644 --- a/plugingui/image.cc +++ b/plugingui/image.cc @@ -28,6 +28,7 @@ #include #include +#include #include @@ -49,7 +50,7 @@ Image::Image(const std::string& filename) Image::~Image() { - free(image_data); + std::free(image_data); } void Image::setError() @@ -70,7 +71,7 @@ void Image::setError() _height = ih; size_t image_size = rc.size() - (sizeof(iw) + sizeof(ih)); - image_data = (unsigned char*)malloc(image_size); + image_data = (unsigned char*)std::malloc(image_size); memcpy(image_data, p, image_size); } diff --git a/plugingui/nativewindow_win32.cc b/plugingui/nativewindow_win32.cc index e9f37a7..cce5a49 100644 --- a/plugingui/nativewindow_win32.cc +++ b/plugingui/nativewindow_win32.cc @@ -312,7 +312,7 @@ NativeWindowWin32::NativeWindowWin32(Window& window) wcex.hbrBackground = nullptr;//(HBRUSH) COLOR_BACKGROUND + 1; // } - wcex.lpszClassName = m_className = strdup("DrumGizmoClass"); + wcex.lpszClassName = m_className = (char*)"DrumGizmoClass"; RegisterClassEx(&wcex); -- cgit v1.2.3