Merge to XFA: Tidy up JS_Defines.h

fpdfsdk/include/javascript/util.h

Index: fpdfsdk/include/javascript/util.h
diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h
index 14857c97cb460da2738454407dd0634a0c905803..b8de46c376838a31102b3d39fdbe4151763f43d3 100644
--- a/fpdfsdk/include/javascript/util.h
+++ b/fpdfsdk/include/javascript/util.h
@@ -14,11 +14,11 @@ public:
 	virtual ~util(void);
 
 public:
-	FX_BOOL printd(OBJ_METHOD_PARAMS);
-	FX_BOOL printf(OBJ_METHOD_PARAMS);
-	FX_BOOL printx(OBJ_METHOD_PARAMS);
-	FX_BOOL scand(OBJ_METHOD_PARAMS);
-	FX_BOOL byteToChar(OBJ_METHOD_PARAMS);
+	FX_BOOL printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
+	FX_BOOL byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, JS_ErrorString& sError);
 
 public:
 	static void		printd(const std::wstring &cFormat,CJS_Date Date,bool bXFAPicture, std::wstring &cPurpose);