diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:20:17 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 18:20:17 +0000 |
| commit | 7def14cd47fb49c0433eae101be352010aa9f292 (patch) | |
| tree | 8d4cdd63e4b4f77ee565eaf0aff52ab842b492d5 /native_client_sdk | |
| parent | cf965e530f18b750e5e5208177fd5219913535f1 (diff) | |
| download | chromium_src-7def14cd47fb49c0433eae101be352010aa9f292.zip chromium_src-7def14cd47fb49c0433eae101be352010aa9f292.tar.gz chromium_src-7def14cd47fb49c0433eae101be352010aa9f292.tar.bz2 | |
[NaCl SDK] Fix build breakage after IRT structure changed.
* The struct nacl_irt_memory has been renamed to nacl_irt_memory_v0_1
* A new struct nacl_irt_memory_v0_2 has been added.
* The nacl_io code was trying to patch values into a struct named
nacl_irt_memory, but it doesn't exist anymore!
BUG= https://code.google.com/p/nativeclient/issues/detail?id=895
R=mseaborn@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13222002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc index 37a58e5..f2aa880 100644 --- a/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc +++ b/native_client_sdk/src/libraries/nacl_io/kernel_wrap_newlib.cc @@ -24,6 +24,8 @@ EXTERN_C_BEGIN #define STRUCT_NAME(group) __libnacl_irt_##group #define DECLARE_STRUCT(group) \ extern struct nacl_irt_##group STRUCT_NAME(group); +#define DECLARE_STRUCT_VERSION(group, version) \ + extern struct nacl_irt_##group##_##version STRUCT_NAME(group); #define MUX(group, name) STRUCT_NAME(group).name #define DECLARE(group, name) typeof(MUX(group, name)) REAL(name); #define DO_WRAP(group, name) do { \ @@ -33,7 +35,7 @@ EXTERN_C_BEGIN DECLARE_STRUCT(fdio) DECLARE_STRUCT(filename) -DECLARE_STRUCT(memory) +DECLARE_STRUCT_VERSION(memory, v0_2) DECLARE(fdio, close) DECLARE(fdio, dup) |