Skip to content

A
angle
Commit e826b9f7 by Jamie Madill
Options

Revert "Fixed compilation on mingw."

This causes some linker warnings. I don't think we should add linker warnings to Chrome, so reverting this temporarily until we can land your CL with the correct using of export keywords. Please re-submit the fixed CL. This reverts commit 56627322. Change-Id: I21fa623af31fac06de6afbefa50c9ea1ec157c15 Reviewed-on: https://chromium-review.googlesource.com/305000Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 000b2f49
Showing with 3 additions and 8 deletions
include/platform/Platform.h
...@@ -134,9 +134,6 @@ class Platform ...@@ -134,9 +134,6 @@ class Platform
} }
extern "C"
{
typedef void(*ANGLEPlatformInitializeFunc)(angle::Platform*); typedef void(*ANGLEPlatformInitializeFunc)(angle::Platform*);
ANGLE_EXPORT void ANGLEPlatformInitialize(angle::Platform*); ANGLE_EXPORT void ANGLEPlatformInitialize(angle::Platform*);
...@@ -146,6 +143,4 @@ ANGLE_EXPORT void ANGLEPlatformShutdown(); ...@@ -146,6 +143,4 @@ ANGLE_EXPORT void ANGLEPlatformShutdown();
typedef angle::Platform *(*ANGLEPlatformCurrentFunc)(); typedef angle::Platform *(*ANGLEPlatformCurrentFunc)();
ANGLE_EXPORT angle::Platform *ANGLEPlatformCurrent(); ANGLE_EXPORT angle::Platform *ANGLEPlatformCurrent();
}
#endif // ANGLE_PLATFORM_H #endif // ANGLE_PLATFORM_H
src/libANGLE/renderer/d3d/RendererD3D.h
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "common/debug.h" #include "common/debug.h"
#include "common/MemoryBuffer.h" #include "common/MemoryBuffer.h"
#include "libANGLE/Data.h" #include "libANGLE/Data.h"
#include "libANGLE/formatutils.h" #include "libANGLe/formatutils.h"
#include "libANGLE/renderer/Renderer.h" #include "libANGLE/renderer/Renderer.h"
#include "libANGLE/renderer/d3d/VertexDataManager.h" #include "libANGLE/renderer/d3d/VertexDataManager.h"
#include "libANGLE/renderer/d3d/formatutilsD3D.h" #include "libANGLE/renderer/d3d/formatutilsD3D.h"
......
src/libANGLE/renderer/d3d/d3d11/texture_format_util.h
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <map> #include <map>
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/d3d11/renderer11.h"
namespace rx namespace rx
{ {
......
src/libANGLE/renderer/gl/wgl/wgl_utils.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "libANGLE/renderer/gl/wgl/wgl_utils.h" #include "libANGLE/renderer/gl/wgl/wgl_utils.h"
#include "libANGLE/renderer/gl/wgl/FunctionsWGL.h" #include "libANGLE/renderer/gl/wgl/functionsWGL.h"
namespace rx namespace rx
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment