svn commit: samba r8336 - in branches/SAMBA_4_0/source/lib/ejs: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-12 02:31:31 +0000 (Tue, 12 Jul 2005)
New Revision: 8336

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8336

Log:
enable 64 bit integer support in ejs



Modified:
   branches/SAMBA_4_0/source/lib/ejs/config.h
   branches/SAMBA_4_0/source/lib/ejs/var.c
   branches/SAMBA_4_0/source/lib/ejs/var.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ejs/config.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ejs/config.h	2005-07-12 01:21:18 UTC (rev 8335)
+++ branches/SAMBA_4_0/source/lib/ejs/config.h	2005-07-12 02:31:31 UTC (rev 8336)
@@ -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

Modified: branches/SAMBA_4_0/source/lib/ejs/var.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ejs/var.c	2005-07-12 01:21:18 UTC (rev 8335)
+++ branches/SAMBA_4_0/source/lib/ejs/var.c	2005-07-12 02:31:31 UTC (rev 8336)
@@ -1796,7 +1796,7 @@
  *	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 @@
  *	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 @@
  *	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 @@
  *	Convert the variable to an Integer type. Only works for primitive types.
  */
 
-int mprVarToInteger(MprVar *vp)
+int mprVarToInteger(const MprVar *vp)
 {
 	mprAssert(vp);
 

Modified: branches/SAMBA_4_0/source/lib/ejs/var.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ejs/var.h	2005-07-12 01:21:18 UTC (rev 8335)
+++ branches/SAMBA_4_0/source/lib/ejs/var.h	2005-07-12 02:31:31 UTC (rev 8336)
@@ -446,14 +446,14 @@
  *	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);