← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/memory/root.h

  • Committer: Olaf van der Spek
  • Date: 2011-06-22 14:35:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2347.
  • Revision ID: olafvdspek@gmail.com-20110622143511-bqcqg1tho8v0fn0d
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/memory/root.h
107
107
  unsigned int first_block_usage;
108
108
 
109
109
  void reset_defaults(size_t block_size, size_t prealloc_size);
110
 
  void* alloc(size_t Size);
 
110
  unsigned char* alloc(size_t Size);
111
111
  void mark_blocks_free();
112
112
  void* memdup(const void*, size_t);
113
113
  char* strdup(const char*);
122
122
    return min_malloc != 0;
123
123
  }
124
124
  void free_root(myf MyFLAGS);
125
 
  void* multi_alloc_root(int unused, ...);
126
 
 
127
 
  void* alloc_root(size_t Size)
128
 
  {
129
 
    return alloc(Size);
130
 
  }
 
125
  void* multi_alloc(int unused, ...);
131
126
 
132
127
  void* calloc(size_t size)
133
128
  {