← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to intern/memutil/MEM_CacheLimiter.h

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/memutil/MEM_CacheLimiter.h
61
61
 
62
62
#ifndef __MEM_cache_limiter_c_api_h_included__
63
63
extern "C" {
64
 
        extern void MEM_CacheLimiter_set_maximum(int m);
65
 
        extern int MEM_CacheLimiter_get_maximum();
66
 
        // this is rather _ugly_!
67
 
        extern int mem_in_use;
68
 
        extern int mmap_in_use;
 
64
        extern void MEM_CacheLimiter_set_maximum(intptr_t m);
 
65
        extern intptr_t MEM_CacheLimiter_get_maximum();
69
66
};
70
67
#endif
71
68
 
141
138
                delete handle;
142
139
        }
143
140
        void enforce_limits() {
144
 
                int max = MEM_CacheLimiter_get_maximum();
 
141
                intptr_t max = MEM_CacheLimiter_get_maximum();
 
142
                intptr_t mem_in_use= MEM_get_memory_in_use();
 
143
                intptr_t mmap_in_use= MEM_get_mapped_memory_in_use();
 
144
 
145
145
                if (max == 0) {
146
146
                        return;
147
147
                }