summaryrefslogtreecommitdiff
path: root/source4/lib/ejs/ejs.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 22:40:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:07 -0500
commitba1ee57df43fe93c8b650478324ddd6cc1a3c7bc (patch)
tree520287c2e17509ba1d9a9895b986a1a59a945e80 /source4/lib/ejs/ejs.h
parent3e5649f79f910c9cad96a362d679f34453e60fa9 (diff)
downloadsamba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.gz
samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.tar.bz2
samba-ba1ee57df43fe93c8b650478324ddd6cc1a3c7bc.zip
r8333: merged with latest upstream ejs sources
(This used to be commit b0f9ddafe95d4e8d846bc72a39e94d22da271348)
Diffstat (limited to 'source4/lib/ejs/ejs.h')
-rw-r--r--source4/lib/ejs/ejs.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/source4/lib/ejs/ejs.h b/source4/lib/ejs/ejs.h
index 79216d4712..f1d2bb4c6e 100644
--- a/source4/lib/ejs/ejs.h
+++ b/source4/lib/ejs/ejs.h
@@ -44,8 +44,8 @@
#ifndef _h_EJS
#define _h_EJS 1
-#include "lib/ejs/miniMpr.h"
-#include "lib/ejs/var.h"
+#include "miniMpr.h"
+#include "var.h"
#ifdef __cplusplus
extern "C" {
@@ -75,7 +75,7 @@ extern void ejsCloseEngine(EjsId eid);
* Evaluation functions
*/
extern int ejsEvalFile(EjsId eid, char *path, MprVar *result, char **emsg);
-extern int ejsEvalScript(EjsId eid, char *script, MprVar *result,
+extern int ejsEvalScript(EjsId eid, char *script, MprVar *result,
char **emsg);
extern int ejsRunFunction(int eid, MprVar *obj, const char *functionName,
MprArray *args);
@@ -87,7 +87,8 @@ extern int ejsRunFunction(int eid, MprVar *obj, const char *functionName,
extern MprVar ejsCreateObj(const char *name, int hashSize);
extern MprVar ejsCreateArray(const char *name, int hashSize);
extern bool ejsDestroyVar(MprVar *obj);
-extern int ejsCopyVar(EjsId eid, const char *var, MprVar *value, bool copyRef);
+extern int ejsCopyVar(EjsId eid, const char *var, MprVar *value,
+ bool copyRef);
extern int ejsReadVar(EjsId eid, const char *var, MprVar *value);
extern int ejsWriteVar(EjsId eid, const char *var, MprVar *value);
extern int ejsWriteVarValue(EjsId eid, const char *var, MprVar value);
@@ -99,8 +100,8 @@ extern MprVar *ejsGetGlobalObject(EjsId eid);
/*
* Function routines
*/
-extern void ejsDefineFunction(EjsId eid, const char *functionName, char *args,
- char *body);
+extern void ejsDefineFunction(EjsId eid, const char *functionName,
+ char *args, char *body);
extern void ejsDefineCFunction(EjsId eid, const char *functionName,
MprCFunction fn, void *thisPtr, int flags);
extern void ejsDefineStringCFunction(EjsId eid, const char *functionName,
@@ -109,7 +110,8 @@ extern void *ejsGetThisPtr(EjsId eid);
extern MprVar *ejsGetReturnValue(EjsId eid);
extern int ejsGetLineNumber(EjsId eid);
extern int ejsParseArgs(int argc, char **argv, char *fmt, ...);
-extern void ejsSetErrorMsg(EjsId eid, const char* fmt, ...) PRINTF_ATTRIBUTE(2,3);
+extern void ejsSetErrorMsg(EjsId eid, const char* fmt, ...)
+ PRINTF_ATTRIBUTE(2,3);
extern void ejsSetReturnValue(EjsId eid, MprVar value);
extern void ejsSetReturnString(EjsId eid, const char *str);