diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-12 12:52:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-12 12:52:31 -0500 |
| commit | 71d786b2d353715031cd3c3ef2dd7fc46b44489b (patch) | |
| tree | 1276ada871a5863363c70110b6ee75d5ff6212bb /src/or/buffers.c | |
| parent | 3dbfc6a734a45fc6e54fd873ba514ea67e1df126 (diff) | |
| parent | d4165ef8b4c2ea697a0b73d80efc6575c0f2279a (diff) | |
| download | tor-71d786b2d353715031cd3c3ef2dd7fc46b44489b.tar.gz tor-71d786b2d353715031cd3c3ef2dd7fc46b44489b.zip | |
Merge branch 'bug2320'
Diffstat (limited to 'src/or/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index bf84fad804..2a5b4e15ce 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -68,8 +68,8 @@ typedef struct chunk_t { size_t datalen; /**< The number of bytes stored in this chunk */ size_t memlen; /**< The number of usable bytes of storage in <b>mem</b>. */ char *data; /**< A pointer to the first byte of data stored in <b>mem</b>. */ - char mem[1]; /**< The actual memory used for storage in this chunk. May be - * more than one byte long. */ + char mem[FLEXIBLE_ARRAY_MEMBER]; /**< The actual memory used for storage in + * this chunk. */ } chunk_t; #define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0]) |