From f74d5f6c18babff226d3028182d0eff7f98db552 Mon Sep 17 00:00:00 2001 From: lahiker42 Date: Fri, 18 Jun 2010 14:46:53 +0000 Subject: [PATCH] random old commits git-svn-id: https://protobuf-c.googlecode.com/svn/trunk@238 00440858-1255-0410-a3e6-75ea37f81c3a --- src/google/protobuf-c/protobuf-c.c | 4 ---- src/google/protobuf-c/protobuf-c.h | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/google/protobuf-c/protobuf-c.c b/src/google/protobuf-c/protobuf-c.c index 2cd53bc..0b050b8 100644 --- a/src/google/protobuf-c/protobuf-c.c +++ b/src/google/protobuf-c/protobuf-c.c @@ -1473,10 +1473,6 @@ struct _ScannedMember const uint8_t *data; }; -#define MESSAGE_GET_UNKNOWNS(message) \ - STRUCT_MEMBER_PTR (ProtobufCMessageUnknownFieldArray, \ - (message), (message)->descriptor->unknown_field_array_offset) - static inline uint32_t scan_length_prefixed_data (size_t len, const uint8_t *data, size_t *prefix_len_out) { diff --git a/src/google/protobuf-c/protobuf-c.h b/src/google/protobuf-c/protobuf-c.h index a839abe..84e5946 100644 --- a/src/google/protobuf-c/protobuf-c.h +++ b/src/google/protobuf-c/protobuf-c.h @@ -91,10 +91,15 @@ struct _ProtobufCAllocator * By default, it uses the system allocator (meaning malloc() and free()). * This is typically done to incorporate into frameworks that provide * some nonstandard allocation functions. + * + * NOTE: you may modify this allocator. */ extern ProtobufCAllocator protobuf_c_default_allocator; /* settable */ -/* This is the system allocator, meaning it uses malloc() and free() */ +/* This is the system allocator, meaning it uses malloc() and free(). + * + * NOTE: please do NOT modify this allocator. + */ extern ProtobufCAllocator protobuf_c_system_allocator; /* use malloc, free etc */ /* This is the function that our default allocators call when they