diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-12 02:31:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:20:07 -0500 |
| commit | 36bb0ffd4c59b17c7f942d874e18865707d3c696 (patch) | |
| tree | 1b722b4e9593f9443b036e50c18d4654bc37dc85 /source4/lib | |
| parent | 70278929fc3065febf7e2d0b538a30cfc073f0fd (diff) | |
| download | samba-36bb0ffd4c59b17c7f942d874e18865707d3c696.tar.gz samba-36bb0ffd4c59b17c7f942d874e18865707d3c696.tar.bz2 samba-36bb0ffd4c59b17c7f942d874e18865707d3c696.zip | |
r8336: enable 64 bit integer support in ejs
(This used to be commit 9dd41e78e1d0e5e4007d5063fbcc335abef43718)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ejs/config.h | 6 | ||||
| -rw-r--r-- | source4/lib/ejs/var.c | 8 | ||||
| -rw-r--r-- | source4/lib/ejs/var.h | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/source4/lib/ejs/config.h b/source4/lib/ejs/config.h index cf75d48270..e6cd603907 100644 --- a/source4/lib/ejs/config.h +++ b/source4/lib/ejs/config.h @@ -47,7 +47,7 @@ #define BLD_FEATURE_EVAL_PERIOD 30 #define BLD_FEATURE_FLOATING_POINT 0 #define BLD_FEATURE_IF_MODIFIED 0 -#define BLD_FEATURE_INT64 0 +#define BLD_FEATURE_INT64 1 #define BLD_FEATURE_KEEP_ALIVE 0 #define BLD_FEATURE_LEGACY_API 0 #define BLD_FEATURE_LIB_STDCPP 0 @@ -58,8 +58,8 @@ #define BLD_FEATURE_MALLOC_STATS 0 #define BLD_FEATURE_MALLOC_LEAK 0 #define BLD_FEATURE_MALLOC_HOOK 0 -#define BLD_FEATURE_NUM_TYPE int -#define BLD_FEATURE_NUM_TYPE_ID MPR_TYPE_INT +#define BLD_FEATURE_NUM_TYPE int64 +#define BLD_FEATURE_NUM_TYPE_ID MPR_TYPE_INT64 #define BLD_FEATURE_ROMFS 0 #define BLD_FEATURE_RUN_AS_SERVICE 0 #define BLD_FEATURE_SAFE_STRINGS 0 diff --git a/source4/lib/ejs/var.c b/source4/lib/ejs/var.c index 2ba56987dd..843d2ff738 100644 --- a/source4/lib/ejs/var.c +++ b/source4/lib/ejs/var.c @@ -1796,7 +1796,7 @@ MprVar mprParseVar(char *buf, MprType preferredType) * Convert the variable to a boolean. Only for primitive types. */ -bool mprVarToBool(MprVar *vp) +bool mprVarToBool(const MprVar *vp) { mprAssert(vp); @@ -1886,7 +1886,7 @@ double mprVarToFloat(MprVar *vp) * Convert the variable to a number type. Only works for primitive types. */ -MprNum mprVarToNumber(MprVar *vp) +MprNum mprVarToNumber(const MprVar *vp) { #if BLD_FEATURE_NUM_TYPE_ID == MPR_TYPE_INT64 return mprVarToInteger64(vp); @@ -1919,7 +1919,7 @@ MprNum mprParseNumber(char *s) * Convert the variable to an Integer64 type. Only works for primitive types. */ -int64 mprVarToInteger64(MprVar *vp) +int64 mprVarToInteger64(const MprVar *vp) { mprAssert(vp); @@ -2034,7 +2034,7 @@ int64 mprParseInteger64(char *str) * Convert the variable to an Integer type. Only works for primitive types. */ -int mprVarToInteger(MprVar *vp) +int mprVarToInteger(const MprVar *vp) { mprAssert(vp); diff --git a/source4/lib/ejs/var.h b/source4/lib/ejs/var.h index 300a0795d8..8ed13a4995 100644 --- a/source4/lib/ejs/var.h +++ b/source4/lib/ejs/var.h @@ -446,14 +446,14 @@ extern int mprGetPropertyCount(MprVar *obj, int includeFlags); * Conversion routines */ extern MprVar mprParseVar(char *str, MprType prefType); -extern MprNum mprVarToNumber(MprVar *vp); -extern int mprVarToInteger(MprVar *vp); +extern MprNum mprVarToNumber(const MprVar *vp); +extern int mprVarToInteger(const MprVar *vp); #if BLD_FEATURE_INT64 -extern int64 mprVarToInteger64(MprVar *vp); +extern int64 mprVarToInteger64(const MprVar *vp); #endif -extern bool mprVarToBool(MprVar *vp); +extern bool mprVarToBool(const MprVar *vp); #if BLD_FEATURE_FLOATING_POINT -extern double mprVarToFloat(MprVar *vp); +extern double mprVarToFloat(const MprVar *vp); #endif extern void mprVarToString(char** buf, int size, char *fmt, MprVar *vp); |