[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - vcl/inc vcl/opengl

[Kohei Yoshida]

 vcl/inc/opengl/program.hxx       |    4 ++++
 vcl/opengl/win/WinDeviceInfo.cxx |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 0a87740ebe2d525d7aab7dce962cf921857d4dd6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Dec 1 21:46:12 2014 -0500

    Fix Windows build.
    
    Change-Id: I9ddd1a9bf572ffa570e23193b01176af8df6f8ed

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 824d0fc..3b3902c 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -12,6 +12,7 @@
 #include <windows.h>
 #include <setupapi.h>
 #include <cstdint>
+#include <rtl/ustrbuf.hxx>
 
 OUString* WinOpenGLDeviceInfo::mpDeviceVendors[wgl::DeviceVendorMax];
 std::vector<wgl::DriverInfo> WinOpenGLDeviceInfo::maDriverInfo;
commit 946badc809116587840a0a041929bc222402e93f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 2 14:16:10 2014 +0100

    Missing include
    
    Change-Id: I4df2b0bb114b8a375d3557c8e33487af737957f4

diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index 96fed09..996bc61 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 #define INCLUDED_VCL_INC_OPENGL_PROGRAM_H
 
+#include <sal/config.h>
+
+#include <list>
+
 #include <GL/glew.h>
 #include <vcl/dllapi.h>