← Back to branch summary

~ubuntu-branches/ubuntu/lucid/blender/lucid

« back to all changes in this revision

Viewing changes to source/blender/blenlib/BLI_memarena.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-08-06 22:32:19 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
Tags: 2.49a+dfsg-0ubuntu1
https://launchpad.net/bugs/382153
* Merge from debian unstable, remaining changes:
  - debian/control: Build-depend on python-2.6 rather than python-2.5.
  - debian/misc/*.desktop: Add Spanish translation to .desktop 
    files.
  - debian/pyversions: 2.6.
  - debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
  - 01_sanitize_sys.patch
  - 02_tmp_in_HOME
  - 10_use_systemwide_ftgl
  - 70_portability_platform_detection
* Removed patches merged upstream:
  - 30_fix_python_syntax_warning
  - 90_ubuntu_ffmpeg_52_changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenlib/BLI_memarena.h
1
1
/* 
2
2
 * Memory arena ADT
3
3
 * 
4
 
 * $Id: BLI_memarena.h 14444 2008-04-16 22:40:48Z hos $
 
4
 * $Id: BLI_memarena.h 17435 2008-11-12 22:35:58Z campbellbarton $
5
5
 *
6
6
 * ***** BEGIN GPL LICENSE BLOCK *****
7
7
 *
50
50
struct MemArena*        BLI_memarena_new        (int bufsize);
51
51
void                            BLI_memarena_free       (struct MemArena *ma);
52
52
 
 
53
void                            BLI_memarena_use_malloc (struct MemArena *ma);
53
54
void                            BLI_memarena_use_calloc (struct MemArena *ma);
54
55
 
55
56
void*                           BLI_memarena_alloc      (struct MemArena *ma, int size);