--- a/openvg/openvgrefimplementation/sfopenvg/sfopenvg/extensions/eglsync.cpp	Thu Nov 18 23:28:27 2010 +0000
+++ b/openvg/openvgrefimplementation/sfopenvg/sfopenvg/extensions/eglsync.cpp	Fri Nov 26 17:41:06 2010 +0000
@@ -153,9 +153,15 @@
     EGLint ret = (EGLint) EGL_FALSE;
     if (iSyncState == EGL_UNSIGNALED_KHR)
         {
-        if (aTimeout && (aFlags & EGL_SYNC_FLUSH_COMMANDS_BIT_KHR) && (eglGetCurrentContext() != EGL_NO_CONTEXT))
+#ifdef BUILD_WITH_PRIVATE_EGL
+			if (aTimeout && (aFlags & EGL_SYNC_FLUSH_COMMANDS_BIT_KHR) && (do_eglGetCurrentContext() != EGL_NO_CONTEXT))
             {
-            switch(eglQueryAPI())
+				switch(do_eglQueryAPI())
+#else
+			if (aTimeout && (aFlags & EGL_SYNC_FLUSH_COMMANDS_BIT_KHR) && (eglGetCurrentContext() != EGL_NO_CONTEXT))
+			{
+				switch(eglQueryAPI())
+#endif
                 {
                 case EGL_OPENGL_ES_API:
                     //ToDo: make sure these cases are covered
@@ -311,8 +317,8 @@
 
 CEglSyncExtension::CEglSyncExtension(OpenVGRI::EGL& aEglInstance):
 iEglSyncMap(),
-iEglSyncId(0)/*,
-iEglInstance(aEglInstance)*/
+iEglSyncId(0),
+iEglInstance(aEglInstance)
     {
 
     }