diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-13 20:50:09 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-13 20:50:09 -0700 |
| commit | 58e6d13f1b8e15e223a1fd416e6febf6aa448ac0 (patch) | |
| tree | 3bb3a18f0128202109d74701aed7e78aa8f2c14c /include/grpc | |
| parent | 7c0cbad3f2ab3c85e79f3c11a413799900ba2d88 (diff) | |
| parent | a6ede891206521ab0c5ad238584bec68a5b2c53a (diff) | |
Merge github.com:grpc/grpc into minimal_test
Diffstat (limited to 'include/grpc')
| -rw-r--r-- | include/grpc/support/alloc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h index 541433c688..017d75a3d0 100644 --- a/include/grpc/support/alloc.h +++ b/include/grpc/support/alloc.h @@ -68,7 +68,8 @@ GPRAPI void gpr_free_aligned(void *ptr); /** Request the family of allocation functions in \a functions be used. NOTE * that this request will be honored in a *best effort* basis and that no - * guarantees are made about the default functions (eg, malloc) being called. */ + * guarantees are made about the default functions (eg, malloc) being called. + * The functions.free_fn implementation must be a no-op for NULL input. */ GPRAPI void gpr_set_allocation_functions(gpr_allocation_functions functions); /** Return the family of allocation functions currently in effect. */ |