doc: Add serial to list of ci file reserved words
[charm.git] / src / conv-core / futures.c
index 8d4bf9bc2c7bd4042fa4980175ae9818f98df09d..f81aa3c6f16c63d8f34d82e244495b675c40d2bb 100644 (file)
@@ -1,11 +1,5 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
 #include <stdlib.h>
+#include <string.h>
 #include "converse.h"
 
 typedef struct Cfuture_data_s
@@ -25,7 +19,7 @@ typedef struct CfutureValue_s
 }
 *CfutureValue;
 
-#define field_offset(t, f) ((CMK_SIZE_T)(((t)0)->f))
+#define field_offset(t, f) ((size_t)(((t)0)->f))
 #define void_to_value(v) ((CfutureValue)(((char*)v)-field_offset(CfutureValue,rest)))
 
 CpvDeclare(int, CfutureStoreIndex);
@@ -55,7 +49,6 @@ static void CfutureAwaken(futdata data, CfutureValue val)
 
 static void CfutureStore(CfutureValue m)
 {
-  CmiGrabBuffer((void **)&m);
   CfutureAwaken(m->data, m);
 }
 
@@ -126,5 +119,5 @@ void CfutureDestroy(Cfuture f)
 void CfutureModuleInit()
 {
   CpvInitialize(int, CfutureStoreIndex);
-  CpvAccess(CfutureStoreIndex) = CmiRegisterHandler(CfutureStore);
+  CpvAccess(CfutureStoreIndex) = CmiRegisterHandler((CmiHandler)CfutureStore);
 }