diff -r 29ddb8a72f0e -r 9f1c3fea0f87 graphicscomposition/openwfcompositionengine/adaptation/include/owfmessagequeue.h
--- a/graphicscomposition/openwfcompositionengine/adaptation/include/owfmessagequeue.h	Tue Jul 06 15:45:57 2010 +0300
+++ b/graphicscomposition/openwfcompositionengine/adaptation/include/owfmessagequeue.h	Wed Aug 18 11:05:09 2010 +0300
@@ -1,4 +1,5 @@
 /* Copyright (c) 2009 The Khronos Group Inc.
+ * Portions copyright (c) 2009-2010  Nokia Corporation and/or its subsidiary(-ies)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and/or associated documentation files (the
@@ -32,6 +33,13 @@
 extern "C" {
 #endif
 
+#define WAIT_FOREVER            -1
+#define MSG_QUEUE_WAIT_MSG_FETCHED      0
+#define MSG_QUEUE_WAIT_MSG_ERR          -1
+#define MSG_QUEUE_WAIT_MSG_TIMEDOUT     -2
+#define MSG_QUEUE_INIT_OK               0
+#define MSG_QUEUE_INIT_ERR              -1
+
 
 typedef struct {
     OWFuint                 id;
@@ -39,8 +47,7 @@
 } OWF_MESSAGE;
 
 typedef struct _MSGQUE {
-    OWFint                  read;
-    OWFint                  write;
+    void*                   queuePtr;
 } OWF_MESSAGE_QUEUE;
 
 /*