commit cadfac411e6690e39de36c4f9e94deb9b7d2d08e
author Jason Sams <jsams@google.com> Wed Mar 06 18:09:08 2013 -0800
committer Jason Sams <jsams@google.com> Wed Mar 06 18:09:08 2013 -0800
tree a90c59b83250bf4c1aa18227c790337aadad79e8
parent d533c4c66510f2b83b9397607756479d79baae10

Sync with compat lib.

Change-Id: Id8ace103814cf126f0d157100d1d4a12cc0b8664

cpu_ref/rsCpuCore.cpp

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index 06e5ce7..c78b238 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -46,8 +46,11 @@
 }
 
 RsdCpuReference * RsdCpuReference::create(Context *rsc, uint32_t version_major,
-        uint32_t version_minor, sym_lookup_t lfn, script_lookup_t slfn,
-        bcc::RSLinkRuntimeCallback pLinkRuntimeCallback) {
+        uint32_t version_minor, sym_lookup_t lfn, script_lookup_t slfn
+#ifndef RS_COMPATIBILITY_LIB
+        , bcc::RSLinkRuntimeCallback pLinkRuntimeCallback
+#endif
+        ) {
 
     RsdCpuReferenceImpl *cpu = new RsdCpuReferenceImpl(rsc);
     if (!cpu) {
@@ -58,7 +61,9 @@
         return NULL;
     }
 
+#ifndef RS_COMPATIBILITY_LIB
     cpu->setLinkRuntimeCallback(pLinkRuntimeCallback);
+#endif
 
     return cpu;
 }
@@ -88,8 +93,9 @@
     memset(&mWorkers, 0, sizeof(mWorkers));
     memset(&mTlsStruct, 0, sizeof(mTlsStruct));
     mExit = false;
+#ifndef RS_COMPATIBILITY_LIB
     mLinkRuntimeCallback = NULL;
-
+#endif
 }