diff options
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/cfxjse_context.cpp | 4 | ||||
| -rw-r--r-- | fxjs/cfxjse_context.h | 2 | ||||
| -rw-r--r-- | fxjs/fxjse.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp index d82f875e0f..076e6cf2b1 100644 --- a/fxjs/cfxjse_context.cpp +++ b/fxjs/cfxjse_context.cpp @@ -11,7 +11,7 @@ namespace { -const FX_CHAR szCompatibleModeScript[] = +const char szCompatibleModeScript[] = "(function(global, list) {\n" " 'use strict';\n" " var objname;\n" @@ -202,7 +202,7 @@ void CFXJSE_Context::EnableCompatibleMode() { ExecuteScript(szCompatibleModeScript, nullptr, nullptr); } -bool CFXJSE_Context::ExecuteScript(const FX_CHAR* szScript, +bool CFXJSE_Context::ExecuteScript(const char* szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject) { CFXJSE_ScopeUtil_IsolateHandleContext scope(this); diff --git a/fxjs/cfxjse_context.h b/fxjs/cfxjse_context.h index a694514770..7b83aee4aa 100644 --- a/fxjs/cfxjse_context.h +++ b/fxjs/cfxjse_context.h @@ -30,7 +30,7 @@ class CFXJSE_Context { v8::Isolate* GetRuntime() { return m_pIsolate; } std::unique_ptr<CFXJSE_Value> GetGlobalObject(); void EnableCompatibleMode(); - bool ExecuteScript(const FX_CHAR* szScript, + bool ExecuteScript(const char* szScript, CFXJSE_Value* lpRetValue, CFXJSE_Value* lpNewThisObject = nullptr); diff --git a/fxjs/fxjse.h b/fxjs/fxjse.h index 069a3b29a3..a29c0893af 100644 --- a/fxjs/fxjse.h +++ b/fxjs/fxjse.h @@ -39,18 +39,18 @@ enum FXJSE_ClassPropTypes { }; struct FXJSE_FUNCTION_DESCRIPTOR { - const FX_CHAR* name; + const char* name; FXJSE_FuncCallback callbackProc; }; struct FXJSE_PROPERTY_DESCRIPTOR { - const FX_CHAR* name; + const char* name; FXJSE_PropAccessor getProc; FXJSE_PropAccessor setProc; }; struct FXJSE_CLASS_DESCRIPTOR { - const FX_CHAR* name; + const char* name; FXJSE_FuncCallback constructor; const FXJSE_PROPERTY_DESCRIPTOR* properties; const FXJSE_FUNCTION_DESCRIPTOR* methods; |