diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-05 15:45:43 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-05 15:45:43 -0700 |
| commit | af20325a459c7446e3c41da243621bae111db001 (patch) | |
| tree | 13436d245b837348a4b3a66e58f1a4dbbcd538e6 /include | |
| parent | 7c5e61394069f6351cb518fbfd6a89e8c2eda1bf (diff) | |
| parent | b7c81e99522fbc5256f20e826eae18f2a33ea76a (diff) | |
| download | system_core-af20325a459c7446e3c41da243621bae111db001.tar.gz system_core-af20325a459c7446e3c41da243621bae111db001.tar.bz2 system_core-af20325a459c7446e3c41da243621bae111db001.zip | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'include')
| -rw-r--r-- | include/acc/acc.h | 3 | ||||
| -rw-r--r-- | include/cutils/ashmem.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/acc/acc.h b/include/acc/acc.h index 054d6a0d..e25fde0d 100644 --- a/include/acc/acc.h +++ b/include/acc/acc.h @@ -69,6 +69,9 @@ void accGetScriptInfoLog(ACCscript* script, void accGetScriptLabel(ACCscript* script, const ACCchar * name, ACCvoid** address); +void accGetPragmas(ACCscript* script, ACCsizei* actualStringCount, + ACCsizei maxStringCount, ACCchar** strings); + #ifdef __cplusplus }; #endif diff --git a/include/cutils/ashmem.h b/include/cutils/ashmem.h index 6e19ad4b..fd56dbef 100644 --- a/include/cutils/ashmem.h +++ b/include/cutils/ashmem.h @@ -20,6 +20,7 @@ int ashmem_create_region(const char *name, size_t size); int ashmem_set_prot_region(int fd, int prot); int ashmem_pin_region(int fd, size_t offset, size_t len); int ashmem_unpin_region(int fd, size_t offset, size_t len); +int ashmem_get_size_region(int fd); #ifdef __cplusplus } |