== Sequencer ==

This fixes Bug #5299 (patch by Vladimir Marek (neuron) ), silencing
Sun CC, which is very picky in it's name mangling behaviour.

2 files changed, 7 insertions, 4 deletions

diff --git a/intern/memutil/MEM_CacheLimiterC-Api.h b/intern/memutil/MEM_CacheLimiterC-Api.h
index c21b91491e8..f06acb5adea 100644
--- a/intern/memutil/MEM_CacheLimiterC-Api.h
+++ b/intern/memutil/MEM_CacheLimiterC-Api.h
@@ -37,6 +37,9 @@ struct MEM_CacheLimiterHandle_s;
 typedef struct MEM_CacheLimiter_s MEM_CacheLimiterC;
 typedef struct MEM_CacheLimiterHandle_s MEM_CacheLimiterHandleC;
 
+/* function used to remove data from memory */
+typedef void(*MEM_CacheLimiter_Destruct_Func)(void*);
+
 #ifndef __MEM_cache_limiter_h_included__
 extern void MEM_CacheLimiter_set_maximum(int m);
 extern int MEM_CacheLimiter_get_maximum();
@@ -50,7 +53,7 @@ extern int MEM_CacheLimiter_get_maximum();
  */
 
 extern MEM_CacheLimiterC * new_MEM_CacheLimiter(
-	void (*data_destructor) (void * data));
+	MEM_CacheLimiter_Destruct_Func data_destructor);
 
 /** 
  * Delete MEM_CacheLimiter
diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
index a259569740b..4cf0ef305d4 100644
--- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
+++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
@@ -53,7 +53,7 @@ typedef std::list<MEM_CacheLimiterHandleCClass*,
 
 class MEM_CacheLimiterCClass {
 public:
-	MEM_CacheLimiterCClass(void (*data_destructor_) (void * data))
+	MEM_CacheLimiterCClass(MEM_CacheLimiter_Destruct_Func data_destructor_)
 		: data_destructor(data_destructor_) { 
 	}
         ~MEM_CacheLimiterCClass();
@@ -67,7 +67,7 @@ public:
 		return &cache;
 	}
 private:
-	void (*data_destructor) (void * data);
+	MEM_CacheLimiter_Destruct_Func data_destructor;
 
 	MEM_CacheLimiter<MEM_CacheLimiterHandleCClass> cache;
 	
@@ -141,7 +141,7 @@ static inline handle_t* cast(MEM_CacheLimiterHandleC * l)
 }
 
 MEM_CacheLimiterC * new_MEM_CacheLimiter(
-	void (*data_destructor) (void * data))
+	MEM_CacheLimiter_Destruct_Func data_destructor)
 {
 	return (MEM_CacheLimiterC*) new MEM_CacheLimiterCClass(
 		data_destructor);