Index: gpu/command_buffer/client/ref_counted.h |
=================================================================== |
--- gpu/command_buffer/client/ref_counted.h (revision 147456) |
+++ gpu/command_buffer/client/ref_counted.h (working copy) |
@@ -5,7 +5,12 @@ |
#ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
#define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ |
-#if defined(__native_client__) |
+// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own |
+// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy, |
+// which uses base. Finesse around this by adding '!defined(OS_NACL)', which |
+// is false for the SRPC build since it doesn't #include build_config.h. Remove |
+// the custom ref_counted class after NaCl has switched proxies. |
+#if defined(__native_client__) && !defined(OS_NACL) |
#include "native_client/src/include/ref_counted.h" |
namespace gpu { |
using nacl::RefCountedThreadSafe; |