Merge change 7939

* changes:
  Split rsScriptC into class implemtation and library functions.  Update test apps, all 3 should be working.

1 files changed, 4 insertions, 2 deletions

diff --git a/libs/rs/rsScriptC.h b/libs/rs/rsScriptC.h
index 3a3f2f7ed43f..860b4d19e1ab 100644
--- a/libs/rs/rsScriptC.h
+++ b/libs/rs/rsScriptC.h
@@ -32,6 +32,7 @@ namespace renderscript {
 class ScriptC : public Script
 {
 public:
+    typedef int (*RunScript_t)(uint32_t launchIndex);
 
     ScriptC();
     virtual ~ScriptC();
@@ -44,7 +45,7 @@ public:
         int mVersionMajor;
         int mVersionMinor;
 
-        rsc_RunScript mScript;
+        RunScript_t mScript;
     };
 
     Program_t mProgram;
@@ -73,7 +74,8 @@ public:
     struct SymbolTable_t {
         const char * mName;
         void * mPtr;
-        const char * mDecl;
+        const char * mRet;
+        const char * mParam;
     };
     static SymbolTable_t gSyms[];
     static const SymbolTable_t * lookupSymbol(const char *);