diff options
author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-04-04 04:34:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-04 04:34:09 +0000 |
commit | 541dd231f9a7282f7fd1092349a322dc67bafaf2 (patch) | |
tree | 3c60f49a1e13e48f71f33f2a41cfca1dd54edfed /runtime/globals.h | |
parent | e9236f03d8c4348a8f1a8767baa1aea60ecdc1f5 (diff) | |
parent | 800ac2defde5d12b2f1f313c6b6162560cfa6fc7 (diff) | |
download | art-541dd231f9a7282f7fd1092349a322dc67bafaf2.zip art-541dd231f9a7282f7fd1092349a322dc67bafaf2.tar.gz art-541dd231f9a7282f7fd1092349a322dc67bafaf2.tar.bz2 |
Merge "Insert an empty read barrier call."
Diffstat (limited to 'runtime/globals.h')
-rw-r--r-- | runtime/globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/globals.h b/runtime/globals.h index ee8dc07..7e85231 100644 --- a/runtime/globals.h +++ b/runtime/globals.h @@ -19,7 +19,7 @@ #include <stddef.h> #include <stdint.h> -#include "read_barrier.h" +#include "read_barrier_c.h" namespace art { |