summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-06 21:45:59 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-06 21:45:59 +0000
commit01233c5482d3e093353dc9099289dc1b3a04698d (patch)
treeb23f25b92c0245c4f19e313ad8c157391f96e9f0 /chrome/nacl
parent6029e6cc519e2334af00c3d06bb38eff731d7455 (diff)
downloadchromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.zip
chromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.tar.gz
chromium_src-01233c5482d3e093353dc9099289dc1b3a04698d.tar.bz2
NaCl: Update revision in DEPS, r8480 -> r8500
This pulls in the following Native Client changes: r8481: (robertm) Enable an additional shared lib for the pnacl ld experiments. r8482: (nfullagar) Build gtest with -Wno-missing-field-initializers. A recent change in r8483: (robertm) Do not ignore unresolved symbols during pnacl dynamic links. r8484: (robertm) Prevent any of "fixedfeaturecpu" tests to be run under pnacl. r8485: (robertm) Make pnacl drivers work static and PIC r8486: (dschuff) Add sandboxed translator to arm HW spec run r8487: (ncbray) Make the browser tester use the real IP of the machine it is running on. r8488: (robertm) Add a step for PIC mode testing to the pnacl toolchain testers. r8489: (robertm) Make the pnacl shared linking experiment work completely without glibc r8490: (robertm) Enable pic test for real r8491: (khim) Add few more CPU-detectable bits to nacl_cpuid.[ch] r8492: (robertm) Make the pnacl dynamic loader experiment call into the ld.so. r8493: (dschuff) Don't use slash in buildbot step name; it causes the stdio output URL to be wrong on the web interface. r8494: (kschimpf) Make default table rows explicit. r8495: (ncbray) Browser tester: dump entire net log if no URLs are loaded. r8496: (khim) Disable mach_forward_untrusted_caught_test on coverage bot r8497: (kschimpf) Remove "x not y" implicit relationships from the table and make explicit! r8498: (robertm) Roll toolchain deps to rev 8495 *r8500: (mseaborn) Exception handling: Windows: Add "const" in some places * The change r8500 above requires a small const fix. BUG=none TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/10384006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/nacl_listener.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc
index 773aa64..b48555b 100644
--- a/chrome/nacl/nacl_listener.cc
+++ b/chrome/nacl/nacl_listener.cc
@@ -84,8 +84,8 @@ int BrokerDuplicateHandle(NaClHandle source_handle,
options);
}
-int AttachDebugExceptionHandler(void* info, size_t info_size) {
- std::string info_string(reinterpret_cast<char*>(info), info_size);
+int AttachDebugExceptionHandler(const void* info, size_t info_size) {
+ std::string info_string(reinterpret_cast<const char*>(info), info_size);
bool result = false;
if (!g_listener->Send(new NaClProcessMsg_AttachDebugExceptionHandler(
info_string, &result)))