diff -up freewrl-1.22.13/src/lib/opengl/Textures.c.xul13 freewrl-1.22.13/src/lib/opengl/Textures.c
--- freewrl-1.22.13/src/lib/opengl/Textures.c.xul13 2012-06-25 22:44:45.470550113 -0400
+++ freewrl-1.22.13/src/lib/opengl/Textures.c 2012-06-25 22:45:28.641553302 -0400
@@ -178,8 +178,8 @@ static void myScaleImage(int srcX,int sr
float YscaleFactor;
float XscaleFactor;
int wye, yex;
- uint32 *src32 = (uint32 *)src;
- uint32 *dest32 = (uint32 *)dest;
+ uint32_t *src32 = (uint32_t *)src;
+ uint32_t *dest32 = (uint32_t *)dest;
if ((srcY<=0) || (destY<=0) || (srcX<=0) || (destX<=0)) return;
if (src == NULL) return;
@@ -1233,12 +1233,12 @@ glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
unsigned char *dest = me->texdata;
#ifdef OLDCODE
OLDCODE #if defined(IPHONE) || defined(_ANDROID)
-OLDCODE uint32 *sp, *dp; /* uint32 not defined on iphone?? */
+OLDCODE uint32_t *sp, *dp; /* uint32 not defined on iphone?? */
OLDCODE #else
-OLDCODE uint32 *sp, *dp;
+OLDCODE uint32_t *sp, *dp;
OLDCODE #endif
#endif // OLDCODE
- uint32 *sp, *dp;
+ uint32_t *sp, *dp;
int cx;
@@ -1281,15 +1281,15 @@ OLDCODE #endif
dest = MALLOC (unsigned char *, 4*rx*ry);
#ifdef OLDCODE
OLDCODE #if defined(IPHONE) || defined(_ANDROID)
-OLDCODE dp = (uint32*) dest;
-OLDCODE sp = (uint32 *)me->texdata;
+OLDCODE dp = (uint32_t*) dest;
+OLDCODE sp = (uint32_t *)me->texdata;
OLDCODE #else
-OLDCODE dp = (uint32 *) dest;
-OLDCODE sp = (uint32 *) me->texdata;
+OLDCODE dp = (uint32_t *) dest;
+OLDCODE sp = (uint32_t *) me->texdata;
OLDCODE #endif
#endif /* OLDCODE */
- dp = (uint32 *) dest;
- sp = (uint32 *) me->texdata;
+ dp = (uint32_t *) dest;
+ sp = (uint32_t *) me->texdata;
diff -up freewrl-1.22.13/src/lib/scenegraph/Component_CubeMapTexturing.c.xul13 freewrl-1.22.13/src/lib/scenegraph/Component_CubeMapTexturing.c
--- freewrl-1.22.13/src/lib/scenegraph/Component_CubeMapTexturing.c.xul13 2012-06-25 22:44:08.770547399 -0400
+++ freewrl-1.22.13/src/lib/scenegraph/Component_CubeMapTexturing.c 2012-06-25 22:44:25.921548667 -0400
@@ -43,7 +43,7 @@ X3D Cubemap Texturing Component
#include "../input/EAIHelpers.h"
/* #include <GL/glext.h> should be in display.h */
#include "../vrml_parser/CParseGeneral.h" /* for union anyVrml */
-#include "../world_script/JScript.h" /* for uint32 typedef */
+#include "../world_script/JScript.h" /* for uint32_t typedef */
/* testing */
@@ -523,8 +523,8 @@ void unpackImageCubeMap (textureTableInd
/* order: right left, top, bottom, back, front */
for (count=0; count <6; count++) {
int x,y;
- uint32 val;
- uint32 *tex = (uint32 *) me->texdata;
+ uint32_t val;
+ uint32_t *tex = (uint32_t *) me->texdata;
struct X3D_PixelTexture *pt = X3D_PIXELTEXTURE(node->__subTextures.p[count]);
int xSubIndex, ySubIndex;
int index;
diff -up freewrl-1.22.13/src/lib/vrml_parser/CRoutes.c.xul13 freewrl-1.22.13/src/lib/vrml_parser/CRoutes.c
--- freewrl-1.22.13/src/lib/vrml_parser/CRoutes.c.xul13 2012-04-17 17:32:13.000000000 -0400
+++ freewrl-1.22.13/src/lib/vrml_parser/CRoutes.c 2012-06-25 22:03:13.313365904 -0400
@@ -80,7 +80,7 @@ static struct X3D_Node *returnSpecificTy
case FIELDTYPE_##thistype: { \
thistype##Native *ptr; \
/* printf ("getting private data in GETJSPTR for %p \n",JSglobal_return_val); */ \
- if ((ptr = (thistype##Native *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(tg->CRoutes.JSglobal_return_val))) == NULL) { \
+ if ((ptr = (thistype##Native *)JS_GetPrivate(JSVAL_TO_OBJECT(tg->CRoutes.JSglobal_return_val))) == NULL) { \
printf( "JS_GetPrivate failed in get_valueChanged_flag\n"); \
JSENDREQUEST_SUBSTITUTION(cx) \
return JS_FALSE; \
@@ -116,7 +116,7 @@ static struct X3D_Node *returnSpecificTy
JSENDREQUEST_SUBSTITUTION(cx) \
return FALSE; \
} \
- if ((ptr = (thisSFtype##Native *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) { \
+ if ((ptr = (thisSFtype##Native *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) { \
printf( "JS_GetPrivate failed for obj in setField_javascriptEventOut.\n"); \
JSENDREQUEST_SUBSTITUTION(cx) \
return FALSE; \
@@ -149,7 +149,7 @@ static struct X3D_Node *returnSpecificTy
JSENDREQUEST_SUBSTITUTION(cx) \
break; \
} \
- if ((ptr = (thisSFtype##Native *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) { \
+ if ((ptr = (thisSFtype##Native *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) { \
printf( "JS_GetPrivate failed for obj in setField_javascriptEventOut.\n"); \
JSENDREQUEST_SUBSTITUTION(cx) \
break; \
diff -up freewrl-1.22.13/src/lib/world_script/fieldGet.c.xul13 freewrl-1.22.13/src/lib/world_script/fieldGet.c
--- freewrl-1.22.13/src/lib/world_script/fieldGet.c.xul13 2012-04-14 18:46:32.000000000 -0400
+++ freewrl-1.22.13/src/lib/world_script/fieldGet.c 2012-06-25 22:03:13.314365904 -0400
@@ -242,7 +242,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFRotation object... */
- newMFObject = JS_ConstructObject(cx, &MFRotationClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFRotationClass,JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -252,8 +252,8 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFRotation object */
- newSFObject = JS_ConstructObject(cx,&SFRotationClass,NULL, newMFObject);
- if ((SFRPptr = (SFRotationNative *)JS_GetPrivate(cx, newSFObject)) == NULL) {
+ newSFObject = JS_ConstructObject(cx,&SFRotationClass, newMFObject);
+ if ((SFRPptr = (SFRotationNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
JS_EndRequest(cx);
@@ -268,7 +268,7 @@ int set_one_MFElementType(int tonode, in
fp = (float *)fp_in; SFRPptr->v.c[3] = *fp; fp_in = offsetPointer_deref(float *,fp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, OBJECT_TO_JSVAL(newSFObject),
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, OBJECT_TO_JSVAL(newSFObject),
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -293,7 +293,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFVec3f object... */
- newMFObject = JS_ConstructObject(cx, &MFVec3fClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFVec3fClass,JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -303,8 +303,8 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFVec3f object */
- newSFObject = JS_ConstructObject(cx,&SFVec3fClass,NULL, newMFObject);
- if ((SFRPptr = (SFVec3fNative *)JS_GetPrivate(cx, newSFObject)) == NULL) {
+ newSFObject = JS_ConstructObject(cx,&SFVec3fClass, newMFObject);
+ if ((SFRPptr = (SFVec3fNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
JS_EndRequest(cx);
@@ -318,7 +318,7 @@ int set_one_MFElementType(int tonode, in
fp = (float *)fp_in; SFRPptr->v.c[2] = *fp; fp_in = offsetPointer_deref(float *,fp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, OBJECT_TO_JSVAL(newSFObject),
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, OBJECT_TO_JSVAL(newSFObject),
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -343,7 +343,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFColor object... */
- newMFObject = JS_ConstructObject(cx, &MFColorClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFColorClass,JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -353,8 +353,8 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFColor object */
- newSFObject = JS_ConstructObject(cx,&SFColorClass,NULL, newMFObject);
- if ((SFRPptr = (SFColorNative *)JS_GetPrivate(cx, newSFObject)) == NULL) {
+ newSFObject = JS_ConstructObject(cx,&SFColorClass, newMFObject);
+ if ((SFRPptr = (SFColorNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
JS_EndRequest(cx);
@@ -368,7 +368,7 @@ int set_one_MFElementType(int tonode, in
fp = (float *)fp_in; SFRPptr->v.c[2] = *fp; fp_in = offsetPointer_deref(float *,fp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, OBJECT_TO_JSVAL(newSFObject),
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, OBJECT_TO_JSVAL(newSFObject),
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -393,7 +393,7 @@ int set_one_MFElementType(int tonode, in
float *fp, *fp_in=(float *)Data;
/* create a new MFVec2f object... */
- newMFObject = JS_ConstructObject(cx, &MFVec2fClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFVec2fClass,JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -403,8 +403,8 @@ int set_one_MFElementType(int tonode, in
elementlen = (int) sizeof (float);
for (x=0; x<datalen; x++) {
/* create a new SFVec2f object */
- newSFObject = JS_ConstructObject(cx,&SFVec2fClass,NULL, newMFObject);
- if ((SFRPptr = (SFVec2fNative *)JS_GetPrivate(cx, newSFObject)) == NULL) {
+ newSFObject = JS_ConstructObject(cx,&SFVec2fClass, newMFObject);
+ if ((SFRPptr = (SFVec2fNative *)JS_GetPrivate(newSFObject)) == NULL) {
printf ("failure in getting SF class at %s:%d\n",__FILE__,__LINE__);
#if defined(JS_THREADSAFE)
JS_EndRequest(cx);
@@ -417,7 +417,7 @@ int set_one_MFElementType(int tonode, in
fp = (float *)fp_in; SFRPptr->v.c[1] = *fp; fp_in = offsetPointer_deref(float *,fp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, OBJECT_TO_JSVAL(newSFObject),
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, OBJECT_TO_JSVAL(newSFObject),
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -441,7 +441,7 @@ int set_one_MFElementType(int tonode, in
jsval newjsval;
float *fp, *fp_in=(float *)Data;
/* create a new MFFloat object... */
- newMFObject = JS_ConstructObject(cx, &MFFloatClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFFloatClass, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -457,7 +457,7 @@ int set_one_MFElementType(int tonode, in
fp_in = offsetPointer_deref(float *,fp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -480,7 +480,7 @@ int set_one_MFElementType(int tonode, in
double *dp, *dp_in=(double *)Data;
/* create a new MFTime object... */
- newMFObject = JS_ConstructObject(cx, &MFTimeClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFTimeClass, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -496,7 +496,7 @@ int set_one_MFElementType(int tonode, in
dp_in = offsetPointer_deref(double *,dp_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -519,7 +519,7 @@ int set_one_MFElementType(int tonode, in
int *ip, *ip_in=(int *)Data;
/* create a new MFInt32 object... */
- newMFObject = JS_ConstructObject(cx, &MFInt32Class, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFInt32Class, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -535,7 +535,7 @@ int set_one_MFElementType(int tonode, in
ip_in = offsetPointer_deref(int *,ip_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -558,7 +558,7 @@ int set_one_MFElementType(int tonode, in
struct Uni_String * *ip_in=(struct Uni_String **)Data;
/* create a new MFString object... */
- newMFObject = JS_ConstructObject(cx, &MFStringClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFStringClass, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* Data points to a Uni_String */
@@ -575,7 +575,7 @@ int set_one_MFElementType(int tonode, in
newjsval = STRING_TO_JSVAL( JS_NewStringCopyZ(cx,chptr));
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -597,7 +597,7 @@ int set_one_MFElementType(int tonode, in
jsval newjsval;
double *ip, *ip_in=(double *)Data;
/* create a new MFNode object... */
- newMFObject = JS_ConstructObject(cx, &MFNodeClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &MFNodeClass, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -611,7 +611,7 @@ int set_one_MFElementType(int tonode, in
ip_in = offsetPointer_deref(double *,ip_in,elementlen);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -635,7 +635,7 @@ int set_one_MFElementType(int tonode, in
double *ip, *ip_in=(double *)Data;
/* create a new MFNode object... */
- newMFObject = JS_ConstructObject(cx, &SFImageClass, NULL ,JS_GetParent(cx, obj));
+ newMFObject = JS_ConstructObject(cx, &SFImageClass, JS_GetParent(obj));
ADD_ROOT (cx, newMFObject)
/* define the "length" property for this object */
@@ -651,7 +651,7 @@ int set_one_MFElementType(int tonode, in
for (x=0; x<datalen; x++) {
newjsval = INT_TO_JSVAL(image.p[x]);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -661,7 +661,7 @@ int set_one_MFElementType(int tonode, in
for (x=0; x<datalen; x++) {
newjsval = INT_TO_JSVAL(0);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -674,7 +674,7 @@ int set_one_MFElementType(int tonode, in
for (x=0; x<datalen; x++) {
newjsval = INT_TO_JSVAL(0);
/* put this object into the MF class */
- if (!JS_DefineElement(cx, newMFObject, (jsint) x, newjsval,
+ if (!JS_DefineElement(cx, newMFObject, (uint32_t) x, newjsval,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB3, JSPROP_ENUMERATE)) {
printf("failure in inserting SF class at %s:%d\n",__FILE__,__LINE__);
}
@@ -827,7 +827,7 @@ void **getInternalDataPointerForJavascri
sfObj = JSVAL_TO_OBJECT(retval);
- if ((_privPtr = JS_GetPrivate(cx, sfObj)) == NULL)
+ if ((_privPtr = JS_GetPrivate(sfObj)) == NULL)
printf("JS_GetPrivate failed set_one_MultiElementType.\n");
if (_privPtr == NULL) return NULL;
diff -up freewrl-1.22.13/src/lib/world_script/fieldSet.c.xul13 freewrl-1.22.13/src/lib/world_script/fieldSet.c
--- freewrl-1.22.13/src/lib/world_script/fieldSet.c.xul13 2012-06-25 22:04:41.991372461 -0400
+++ freewrl-1.22.13/src/lib/world_script/fieldSet.c 2012-06-25 22:05:14.946374893 -0400
@@ -1317,7 +1317,7 @@ void getJSMultiNumType (JSContext *cx, s
SFNodeNative *_vec;
/* printf ("yep, this is an SFNode class\n"); */
- if ((_vec = (SFNodeNative *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) {
+ if ((_vec = (SFNodeNative *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) {
printf ("error getting native\n");
*nl = NULL;
} else {
@@ -1356,7 +1356,7 @@ void getJSMultiNumType (JSContext *cx, s
}
case FIELDTYPE_SFVec2f: {
if (JSVAL_IS_OBJECT(mainElement)) {
- if ((sfvec2f = (SFVec2fNative *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) {
+ if ((sfvec2f = (SFVec2fNative *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) {
printf( "JS_GetPrivate failed for obj in setField_javascriptEventOut.\n");
return;
}
@@ -1371,7 +1371,7 @@ void getJSMultiNumType (JSContext *cx, s
case FIELDTYPE_SFVec3f:
case FIELDTYPE_SFColor: { /* SFColor */
if (JSVAL_IS_OBJECT(mainElement)) {
- if ((sfvec3f = (SFVec3fNative *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) {
+ if ((sfvec3f = (SFVec3fNative *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) {
printf( "JS_GetPrivate failed for obj in setField_javascriptEventOut.\n");
return;
}
@@ -1387,7 +1387,7 @@ void getJSMultiNumType (JSContext *cx, s
}
case FIELDTYPE_SFRotation: {
if (JSVAL_IS_OBJECT(mainElement)) {
- if ((sfrotation = (SFRotationNative *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) {
+ if ((sfrotation = (SFRotationNative *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) {
printf( "JS_GetPrivate failed for obj in setField_javascriptEventOut.\n");
return;
}
diff -up freewrl-1.22.13/src/lib/world_script/jsUtils.c.xul13 freewrl-1.22.13/src/lib/world_script/jsUtils.c
--- freewrl-1.22.13/src/lib/world_script/jsUtils.c.xul13 2012-06-25 22:06:17.026379484 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsUtils.c 2012-06-25 22:10:38.202398787 -0400
@@ -161,7 +161,7 @@ static JSBool setSF_in_MF (JSContext *cx
/* copy this value out to the X3D scene graph */
me = obj;
- par = JS_GetParent(cx, me);
+ par = JS_GetParent(me);
while (par != NULL) {
#ifdef JSVRMLCLASSESVERBOSE
printf ("for obj %u: ",me);
@@ -208,7 +208,7 @@ static JSBool setSF_in_MF (JSContext *cx
}
me = par;
- par = JS_GetParent(cx, me);
+ par = JS_GetParent(me);
}
p->insetSFStr = FALSE;
return JS_TRUE;
@@ -303,7 +303,7 @@ static void JS_SF_TO_X3D(JSContext *cx,
#endif
/* get a pointer to the internal private data */
- if ((VPtr = JS_GetPrivate(cx, JSVAL_TO_OBJECT(*newval))) == NULL) {
+ if ((VPtr = JS_GetPrivate(JSVAL_TO_OBJECT(*newval))) == NULL) {
printf( "JS_GetPrivate failed in JS_SF_TO_X3D.\n");
return;
}
@@ -463,7 +463,7 @@ static void X3D_SF_TO_JS(JSContext *cx,
}
/* get a pointer to the internal private data */
- if ((VPtr = JS_GetPrivate(cx, JSVAL_TO_OBJECT(*newval))) == NULL) {
+ if ((VPtr = JS_GetPrivate(JSVAL_TO_OBJECT(*newval))) == NULL) {
printf( "JS_GetPrivate failed in X3D_SF_TO_JS.\n");
return;
}
@@ -542,7 +542,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
SFNodeNative *VNptr;
/* get a pointer to the internal private data */
- if ((VNptr = JS_GetPrivate(cx, obj)) == NULL) {
+ if ((VNptr = JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in X3D_MF_TO_JS.\n");
return;
}
@@ -617,7 +617,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
case FIELDTYPE_MFInt32:
MIptr = (struct Multi_Int32*) Data;
for (i=0; i<MIptr->n; i++) {
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, INT_TO_JSVAL(MIptr->p[i]),
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, INT_TO_JSVAL(MIptr->p[i]),
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFInt32Constr.\n", i);
return;
@@ -627,7 +627,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
case FIELDTYPE_MFFloat:
MFptr = (struct Multi_Float*) Data;
for (i=0; i<MFptr->n; i++) {
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, INT_TO_JSVAL(MFptr->p[i]),
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, INT_TO_JSVAL(MFptr->p[i]),
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFFloatConstr.\n", i);
return;
@@ -637,7 +637,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
case FIELDTYPE_MFTime:
MTptr = (struct Multi_Time*) Data;
for (i=0; i<MTptr->n; i++) {
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, INT_TO_JSVAL(MTptr->p[i]),
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, INT_TO_JSVAL(MTptr->p[i]),
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFTimeConstr.\n", i);
return;
@@ -660,7 +660,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
printf ("error creating the new object in X3D_MF_TO_JS string :%s:\n",newline);
return;
}
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, xf,
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, xf,
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u .\n", i);
return;
@@ -680,7 +680,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
printf ("error creating the new object in X3D_MF_TO_JS string :%s:\n",newline);
return;
}
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, xf,
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, xf,
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u .\n", i);
return;
@@ -699,7 +699,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
printf ("error creating the new object in X3D_MF_TO_JS string :%s:\n",newline);
return;
}
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, xf,
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, xf,
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u .\n", i);
return;
@@ -723,7 +723,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
printf ("error creating the new object in X3D_MF_TO_JS string :%s:\n",newline);
return;
}
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, xf,
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, xf,
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u .\n", i);
return;
@@ -758,7 +758,7 @@ static void X3D_MF_TO_JS(JSContext *cx,
printf ("error creating the new object in X3D_MF_TO_JS string :%s:\n",newline);
return;
}
- if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (jsint) i, xf,
+ if (!JS_DefineElement(cx, JSVAL_TO_OBJECT(*newval), (uint32_t) i, xf,
JS_GET_PROPERTY_STUB, setSF_in_MF, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u .\n", i);
return;
@@ -980,7 +980,7 @@ static JSBool getSFNodeField (JSContext
printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj);
#endif
- if ((ptr = (SFNodeNative *)JS_GetPrivate(context, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in getSFNodeField.\n");
#if JS_VERSION >= 185
JS_free(context,_id_c);
@@ -1190,7 +1190,7 @@ JSBool setSFNodeField (JSContext *contex
#endif
/* get the private data. This will contain a pointer into the FreeWRL scenegraph */
- if ((ptr = (SFNodeNative *)JS_GetPrivate(context, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in setSFNodeField.\n");
#if JS_VERSION >= 185
JS_free(context,_id_c);
@@ -1295,7 +1295,7 @@ JSBool setSFNodeField (JSContext *contex
int JS_DefineSFNodeSpecificProperties (JSContext *context, JSObject *object, struct X3D_Node * ptr) {
int *fieldOffsetsPtr;
jsval rval = INT_TO_JSVAL(0);
- uintN attrs = JSPROP_PERMANENT
+ unsigned attrs = JSPROP_PERMANENT
| JSPROP_ENUMERATE
#ifdef JSPROP_EXPORTED
| JSPROP_EXPORTED
@@ -1333,7 +1333,7 @@ int JS_DefineSFNodeSpecificProperties (J
#endif
/* have we already done this for this node? We really do not want to do this again */
- if ((nodeNative = (SFNodeNative *)JS_GetPrivate(context,object)) == NULL) {
+ if ((nodeNative = (SFNodeNative *)JS_GetPrivate(object)) == NULL) {
printf ("JS_DefineSFNodeSpecificProperties, can not get private for a SFNode!\n");
return JS_FALSE;
}
@@ -1462,7 +1462,7 @@ holding object needs to route to FreeWRL
return JS_FALSE; \
} \
\
- if ((ptr = (thisSFtype##Native *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(mainElement))) == NULL) {\
+ if ((ptr = (thisSFtype##Native *)JS_GetPrivate(JSVAL_TO_OBJECT(mainElement))) == NULL) {\
printf( "JS_GetPrivate failed in assignCheck.\n"); \
return JS_FALSE; \
} else { \
diff -up freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c.xul13 freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c
--- freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c.xul13 2012-06-25 22:11:07.512400956 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c 2012-06-25 22:23:02.593453810 -0400
@@ -84,7 +84,7 @@ static JSClass Browser = {
JS_FinalizeStub
};
-static JSBool doVRMLRoute(JSContext *context, JSObject *obj, uintN argc, jsval *argv, const char *browserFunc);
+static JSBool doVRMLRoute(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, const char *browserFunc);
static JSFunctionSpec (BrowserFunctions)[] = {
{"getName", VrmlBrowserGetName, 0},
@@ -236,19 +236,16 @@ VrmlBrowserInit(JSContext *context, JSOb
return JS_FALSE;
}
- if (!JS_SetPrivate(context, obj, brow)) {
- printf( "JS_SetPrivate failed in VrmlBrowserInit.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, brow);
return JS_TRUE;
}
JSBool
#if JS_VERSION < 185
-VrmlBrowserGetName(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserGetName(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserGetName(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserGetName(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -271,9 +268,9 @@ VrmlBrowserGetName(JSContext *context, u
/* get the string stored in FWVER into a jsObject */
JSBool
#if JS_VERSION < 185
-VrmlBrowserGetVersion(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserGetVersion(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserGetVersion(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserGetVersion(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -295,9 +292,9 @@ VrmlBrowserGetVersion(JSContext *context
JSBool
#if JS_VERSION < 185
-VrmlBrowserGetCurrentSpeed(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserGetCurrentSpeed(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserGetCurrentSpeed(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserGetCurrentSpeed(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -323,9 +320,9 @@ VrmlBrowserGetCurrentSpeed(JSContext *co
JSBool
#if JS_VERSION < 185
-VrmlBrowserGetCurrentFrameRate(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserGetCurrentFrameRate(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserGetCurrentFrameRate(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserGetCurrentFrameRate(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -349,9 +346,9 @@ VrmlBrowserGetCurrentFrameRate(JSContext
JSBool
#if JS_VERSION < 185
-VrmlBrowserGetWorldURL(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserGetWorldURL(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserGetWorldURL(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserGetWorldURL(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -373,9 +370,9 @@ VrmlBrowserGetWorldURL(JSContext *contex
JSBool
#if JS_VERSION < 185
-VrmlBrowserReplaceWorld(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserReplaceWorld(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserReplaceWorld(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserReplaceWorld(JSContext *context, unsigned argc, jsval *vp) {
jsval *argv = JS_ARGV(context,vp);
#endif
JSObject *_obj;
@@ -388,7 +385,7 @@ VrmlBrowserReplaceWorld(JSContext *conte
char *tptr;
if (JS_ConvertArguments(context, argc, argv, _c_format, &_obj)) {
- if ((_cls = JS_GET_CLASS(context, _obj)) == NULL) {
+ if ((_cls = JS_GetClass(_obj)) == NULL) {
printf("JS_GetClass failed in VrmlBrowserReplaceWorld.\n");
return JS_FALSE;
}
@@ -430,9 +427,9 @@ VrmlBrowserReplaceWorld(JSContext *conte
struct X3D_Anchor* get_EAIEventsIn_AnchorNode();
JSBool
#if JS_VERSION < 185
-VrmlBrowserLoadURL(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserLoadURL(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserLoadURL(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserLoadURL(JSContext *context, unsigned argc, jsval *vp) {
jsval *argv = JS_ARGV(context,vp);
#endif
JSObject *_obj[2];
@@ -445,11 +442,11 @@ VrmlBrowserLoadURL(JSContext *context, u
char myBuf[myBufSize];
if (JS_ConvertArguments(context, argc, argv, _c_format, &(_obj[0]), &(_obj[1]))) {
- if ((_cls[0] = JS_GET_CLASS(context, _obj[0])) == NULL) {
+ if ((_cls[0] = JS_GetClass(_obj[0])) == NULL) {
printf( "JS_GetClass failed for arg 0 in VrmlBrowserLoadURL.\n");
return JS_FALSE;
}
- if ((_cls[1] = JS_GET_CLASS(context, _obj[1])) == NULL) {
+ if ((_cls[1] = JS_GetClass(_obj[1])) == NULL) {
printf( "JS_GetClass failed for arg 1 in VrmlBrowserLoadURL.\n");
return JS_FALSE;
}
@@ -505,10 +502,10 @@ VrmlBrowserLoadURL(JSContext *context, u
JSBool
#if JS_VERSION < 185
-VrmlBrowserSetDescription(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserSetDescription(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
char *_c_format = "s";
#else
-VrmlBrowserSetDescription(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserSetDescription(JSContext *context, unsigned argc, jsval *vp) {
jsval *argv = JS_ARGV(context,vp);
JSString *js_c;
char *_c_format = "S";
@@ -540,10 +537,10 @@ VrmlBrowserSetDescription(JSContext *con
JSBool
#if JS_VERSION < 185
-VrmlBrowserCreateVrmlFromString(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserCreateVrmlFromString(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
char *_c_format = "s";
#else
-VrmlBrowserCreateVrmlFromString(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserCreateVrmlFromString(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
jsval _my_rval;
@@ -635,9 +632,9 @@ VrmlBrowserCreateVrmlFromString(JSContex
JSBool
#if JS_VERSION < 185
-VrmlBrowserCreateVrmlFromURL(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserCreateVrmlFromURL(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlBrowserCreateVrmlFromURL(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserCreateVrmlFromURL(JSContext *context, unsigned argc, jsval *vp) {
jsval *argv = JS_ARGV(context,vp);
jsval _my_rval;
jsval *rval = &_my_rval;
@@ -680,7 +677,7 @@ VrmlBrowserCreateVrmlFromURL(JSContext *
/* first parameter - expect a MFString Object here */
if (JSVAL_IS_OBJECT(argv[0])) {
- if ((_cls[0] = JS_GET_CLASS(context, JSVAL_TO_OBJECT(argv[0]))) == NULL) {
+ if ((_cls[0] = JS_GetClass(JSVAL_TO_OBJECT(argv[0]))) == NULL) {
printf( "JS_GetClass failed for arg 0 in VrmlBrowserLoadURL.\n");
return JS_FALSE;
}
@@ -691,7 +688,7 @@ VrmlBrowserCreateVrmlFromURL(JSContext *
/* second parameter - expect a SFNode Object here */
if (JSVAL_IS_OBJECT(argv[1])) {
- if ((_cls[1] = JS_GET_CLASS(context, JSVAL_TO_OBJECT(argv[1]))) == NULL) {
+ if ((_cls[1] = JS_GetClass(JSVAL_TO_OBJECT(argv[1]))) == NULL) {
printf( "JS_GetClass failed for arg 1 in VrmlBrowserLoadURL.\n");
return JS_FALSE;
}
@@ -747,7 +744,7 @@ VrmlBrowserCreateVrmlFromURL(JSContext *
/* get a pointer to the SFNode structure, in order to properly place the new string */
- if ((oldPtr = (SFNodeNative *)JS_GetPrivate(context, JSVAL_TO_OBJECT(argv[1]))) == NULL) {
+ if ((oldPtr = (SFNodeNative *)JS_GetPrivate(JSVAL_TO_OBJECT(argv[1]))) == NULL) {
printf( "JS_GetPrivate failed in VrmlBrowserLoadURL for SFNode parameter.\n");
#if JS_VERSION >= 185
JS_free(context,_costr0);
@@ -835,10 +832,10 @@ VrmlBrowserCreateVrmlFromURL(JSContext *
JSBool
#if JS_VERSION < 185
-VrmlBrowserAddRoute(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserAddRoute(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
jsval _rval = INT_TO_JSVAL(0);
#else
-VrmlBrowserAddRoute(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserAddRoute(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -859,10 +856,10 @@ VrmlBrowserAddRoute(JSContext *context,
#endif
JSBool
#if JS_VERSION < 185
-VrmlBrowserPrint(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserPrint(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
jsval _rval = INT_TO_JSVAL(0);
#else
-VrmlBrowserPrint(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserPrint(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -918,10 +915,10 @@ VrmlBrowserPrint(JSContext *context, uin
JSBool
#if JS_VERSION < 185
-VrmlBrowserPrintln(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserPrintln(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
VrmlBrowserPrint(context,obj,argc,argv,rval);
#else
-VrmlBrowserPrintln(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserPrintln(JSContext *context, unsigned argc, jsval *vp) {
/* note, vp holds rval, since it is set in here we should be good */
VrmlBrowserPrint(context,argc,vp);
#endif
@@ -938,10 +935,10 @@ VrmlBrowserPrintln(JSContext *context, u
JSBool
#if JS_VERSION < 185
-VrmlBrowserDeleteRoute(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlBrowserDeleteRoute(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
jsval _rval = INT_TO_JSVAL(0);
#else
-VrmlBrowserDeleteRoute(JSContext *context, uintN argc, jsval *vp) {
+VrmlBrowserDeleteRoute(JSContext *context, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(context,vp);
jsval *argv = JS_ARGV(context,vp);
#endif
@@ -990,7 +987,7 @@ OLDCODE
OLDCODE
OLDCODE/* return an MFString containing all of the devices CURRENTLY defined on the MIDI interface list */
OLDCODEJSBool
-OLDCODEVrmlBrowserGetMidiDeviceList(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+OLDCODEVrmlBrowserGetMidiDeviceList(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval)
OLDCODE{
OLDCODE int i;
OLDCODE JSString *_str;
@@ -1052,7 +1049,7 @@ OLDCODE
OLDCODE/* find a MIDI device, (parameter input is a String) and return MFString of controller names */
OLDCODE/* returns a MFString with 0 entries, if no controller is found */
OLDCODEJSBool
-OLDCODEVrmlBrowserGetMidiDeviceInfo(JSContext *context, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+OLDCODEVrmlBrowserGetMidiDeviceInfo(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, jsval *rval)
OLDCODE{
OLDCODE JSString *_str;
OLDCODE JSObject *myObj;
@@ -1149,7 +1146,7 @@ OLDCODE#define MIDICONMIN 2
OLDCODE#define MIDICONMAX 3
OLDCODE
OLDCODE/* do the guts of the getMidiControllerNumber, ControllerMax and ControllerMin */
-OLDCODEint findMidiNumber (JSContext *cx, uintN argc, jsval *argv, int myFn) {
+OLDCODEint findMidiNumber (JSContext *cx, unsigned argc, jsval *argv, int myFn) {
OLDCODE char *targetDevice;
OLDCODE char *targetController;
OLDCODE int encDev;
@@ -1225,19 +1222,19 @@ OLDCODE return -1;
OLDCODE}
OLDCODE
OLDCODE/* send in 2 Strings; MIDI Device and controller, returns number on device, or -1 on error */
-OLDCODEJSBool VrmlBrowserGetMidiControllerNumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+OLDCODEJSBool VrmlBrowserGetMidiControllerNumber(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
OLDCODE *rval = INT_TO_JSVAL(findMidiNumber (cx, argc, argv, MIDICONNUM));
OLDCODE return JS_TRUE;
OLDCODE}
OLDCODE
OLDCODE/* send in 2 Strings; MIDI Device and controller, returns minimum value, or -1 on error */
-OLDCODEJSBool VrmlBrowserGetMidiControllerMin(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+OLDCODEJSBool VrmlBrowserGetMidiControllerMin(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
OLDCODE *rval = INT_TO_JSVAL(findMidiNumber (cx, argc, argv, MIDICONMIN));
OLDCODE return JS_TRUE;
OLDCODE}
OLDCODE
OLDCODE/* send in 2 Strings; MIDI Device and controller, returns maximum value, or -1 on error */
-OLDCODEJSBool VrmlBrowserGetMidiControllerMax(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+OLDCODEJSBool VrmlBrowserGetMidiControllerMax(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
OLDCODE *rval = INT_TO_JSVAL(findMidiNumber (cx, argc, argv, MIDICONMAX));
OLDCODE return JS_TRUE;
OLDCODE}
@@ -1248,7 +1245,7 @@ OLDCODE
/****************************************************************************************************/
/* internal to add/remove a ROUTE */
-static JSBool doVRMLRoute(JSContext *context, JSObject *obj, uintN argc, jsval *argv, const char *callingFunc) {
+static JSBool doVRMLRoute(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, const char *callingFunc) {
JSObject *fromNodeObj, *toNodeObj;
SFNodeNative *fromNative, *toNative;
JSClass *_cls[2];
@@ -1284,12 +1281,12 @@ static JSBool doVRMLRoute(JSContext *con
fromFieldString = JS_EncodeString(context,fromFieldStringJS);
toFieldString = JS_EncodeString(context,toFieldStringJS);
#endif
- if ((_cls[0] = JS_GET_CLASS(context, fromNodeObj)) == NULL) {
+ if ((_cls[0] = JS_GetClass(fromNodeObj)) == NULL) {
printf("JS_GetClass failed for arg 0 in doVRMLRoute called from %s.\n",
callingFunc);
return JS_FALSE;
}
- if ((_cls[1] = JS_GET_CLASS(context, toNodeObj)) == NULL) {
+ if ((_cls[1] = JS_GetClass(toNodeObj)) == NULL) {
printf("JS_GetClass failed for arg 2 in doVRMLRoute called from %s.\n",
callingFunc);
return JS_FALSE;
@@ -1304,11 +1301,11 @@ static JSBool doVRMLRoute(JSContext *con
}
/* get the "private" data for these nodes. It will consist of a SFNodeNative structure */
- if ((fromNative = (SFNodeNative *)JS_GetPrivate(context, fromNodeObj)) == NULL) {
+ if ((fromNative = (SFNodeNative *)JS_GetPrivate(fromNodeObj)) == NULL) {
printf ("problem getting native props\n");
return JS_FALSE;
}
- if ((toNative = (SFNodeNative *)JS_GetPrivate(context, toNodeObj)) == NULL) {
+ if ((toNative = (SFNodeNative *)JS_GetPrivate(toNodeObj)) == NULL) {
printf ("problem getting native props\n");
return JS_FALSE;
}
diff -up freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.h.xul13 freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.h
--- freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.h.xul13 2012-06-25 22:05:39.988376746 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.h 2012-06-25 22:05:49.353377437 -0400
@@ -44,127 +44,127 @@ JSBool VrmlBrowserInit(JSContext *contex
#if JS_VERSION < 185
JSBool VrmlBrowserGetName(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserGetVersion(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserGetCurrentSpeed(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserGetCurrentFrameRate(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserGetWorldURL(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserReplaceWorld(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserLoadURL(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserSetDescription(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserCreateVrmlFromString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserCreateVrmlFromURL(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserAddRoute(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserPrint(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserPrintln(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool VrmlBrowserDeleteRoute(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool VrmlBrowserGetName(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserGetVersion(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserGetCurrentSpeed(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserGetCurrentFrameRate(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserGetWorldURL(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserReplaceWorld(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserLoadURL(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserSetDescription(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserCreateVrmlFromString(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserCreateVrmlFromURL(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserAddRoute(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserPrint(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserPrintln(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlBrowserDeleteRoute(JSContext *cx, uintN argc, jsval *vp);
+JSBool VrmlBrowserGetName(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserGetVersion(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserGetCurrentSpeed(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserGetCurrentFrameRate(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserGetWorldURL(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserReplaceWorld(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserLoadURL(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserSetDescription(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserCreateVrmlFromString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserCreateVrmlFromURL(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserAddRoute(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserPrint(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserPrintln(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlBrowserDeleteRoute(JSContext *cx, unsigned argc, jsval *vp);
#endif
#ifdef OLDCODE
OLDCODEJSBool VrmlBrowserGetMidiDeviceList(JSContext *cx,
OLDCODE JSObject *obj,
-OLDCODE uintN argc,
+OLDCODE unsigned argc,
OLDCODE jsval *argv,
OLDCODE jsval *rval);
OLDCODE
OLDCODEJSBool VrmlBrowserGetMidiDeviceInfo(JSContext *cx,
OLDCODE JSObject *obj,
-OLDCODE uintN argc,
+OLDCODE unsigned argc,
OLDCODE jsval *argv,
OLDCODE jsval *rval);
#endif // OLDCODE
diff -up freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.c.xul13 freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.c
--- freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.c.xul13 2012-06-25 22:04:10.446370128 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.c 2012-06-25 22:25:55.905466619 -0400
@@ -939,7 +939,7 @@ JSBool _simplecopyElements (JSContext *c
#endif
for (i = 0; i < count; i++) {
- if (!JS_GetElement(cx, fromObj, (jsint) i, &val)) {
+ if (!JS_GetElement(cx, fromObj, (uint32_t) i, &val)) {
printf( "failed in get %d index %d.\n",type, i);
return JS_FALSE;
}
@@ -965,7 +965,7 @@ JSBool _simplecopyElements (JSContext *c
if (JSVAL_IS_INT(val)) printf ("sc, element %d is an INT\n",i);
*/
- if (!JS_SetElement(cx, toObj, (jsint) i, &val)) {
+ if (!JS_SetElement(cx, toObj, (uint32_t) i, &val)) {
printf( "failed in set %d index %d.\n", type, i);
return JS_FALSE;
}
@@ -977,7 +977,7 @@ JSBool _simplecopyElements (JSContext *c
/* make a standard assignment for MF variables */
JSBool _standardMFAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval,
JSClass *myClass,
@@ -985,7 +985,7 @@ JSBool _standardMFAssign(JSContext *cx,
JSObject *_from_obj;
jsval val;
- int32 len;
+ int32_t len;
char *_id_str;
SFImageNative *ptr;
#if JS_VERSION >= 185
@@ -1041,7 +1041,7 @@ JSBool _standardMFAssign(JSContext *cx,
/* SF* values that use this routine - check if we need to set valueChanged in private area */
if (type == FIELDTYPE_SFImage) {
- if ((ptr = (SFImageNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFImageNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in standard MF assign.\n");
return JS_FALSE;
}
@@ -1064,7 +1064,7 @@ _standardMFGetProperty(JSContext *cx,
char *makeNewElement,
int type) {
- int32 _length, _index;
+ int32_t _length, _index;
jsval _length_val;
/* in case we need to run makeNewElement*/
@@ -1123,7 +1123,7 @@ _standardMFGetProperty(JSContext *cx,
printf ("defining element %d now... is %d %#x\n",_index,(int)*vp,(unsigned int)*vp);
#endif
- if (!JS_DefineElement(cx, obj, (jsint) _index, *vp,
+ if (!JS_DefineElement(cx, obj, (uint32_t) _index, *vp,
JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB8,
JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed in %d.\n",type);
@@ -1624,7 +1624,7 @@ doMFSetProperty(JSContext *cx, JSObject
here's the call to find the parent for the above. */
me = obj;
- par = JS_GetParent(cx, me);
+ par = JS_GetParent(me);
while (par != NULL) {
#ifdef JSVRMLCLASSESVERBOSE
printf ("for obj %p: ",me);
@@ -1671,7 +1671,7 @@ doMFSetProperty(JSContext *cx, JSObject
}
me = par;
- par = JS_GetParent(cx, me);
+ par = JS_GetParent(me);
}
return JS_TRUE;
@@ -2015,7 +2015,7 @@ setAssignProperty(JSContext *cx, JSObjec
{
JSObject *_o;
JSString *_str;
- const uintN _argc = 2;
+ const unsigned _argc = 2;
#ifdef _MSC_VER
jsval newVal, initVal, _argv[2]; /* win32 complains cant allocate array of size 0 */
#else
diff -up freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.h.xul13 freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.h
--- freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.h.xul13 2012-04-21 17:21:40.000000000 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRMLClasses.h 2012-06-25 22:03:13.315365904 -0400
@@ -245,25 +245,25 @@ setAssignProperty(JSContext *context,
#if JS_VERSION < 185
JSBool
-SFColorGetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorGetHSV(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorSetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorSetHSV(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#else
-JSBool SFColorGetHSV(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorSetHSV(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFColorGetHSV(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorSetHSV(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
#if JS_VERSION < 185
@@ -276,25 +276,25 @@ JSBool SFColorSetProperty(JSContext *cx,
#if JS_VERSION < 185
JSBool
-SFColorRGBAGetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorRGBAGetHSV(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorRGBASetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorRGBASetHSV(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorRGBAToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorRGBAToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorRGBAAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorRGBAAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
-SFColorRGBAConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+SFColorRGBAConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#else
-JSBool SFColorRGBAGetHSV(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorRGBASetHSV(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorRGBAToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorRGBAAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFColorRGBAConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFColorRGBAGetHSV(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorRGBASetHSV(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorRGBAToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorRGBAAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFColorRGBAConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
#if JS_VERSION < 185
@@ -309,14 +309,14 @@ JSBool SFColorRGBASetProperty(JSContext
JSBool
SFImageToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFImageAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
@@ -324,13 +324,13 @@ SFImageAssign(JSContext *cx,
JSBool
SFImageConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool SFImageToString(JSContext *cx, uintN argc,jsval *vp);
-JSBool SFImageAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFImageConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFImageToString(JSContext *cx, unsigned argc,jsval *vp);
+JSBool SFImageAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFImageConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
JSBool
@@ -360,26 +360,26 @@ SFImageSetProperty(JSContext *cx,
JSBool
SFNodeToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFNodeAssign(JSContext *cx, JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFNodeConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool SFNodeToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFNodeAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFNodeConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFNodeToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFNodeAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFNodeConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
void SFNodeFinalize(JSContext *cx, JSObject *obj);
@@ -410,7 +410,7 @@ SFNodeSetProperty(JSContext *cx,
JSBool
SFRotationGetAxis(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
@@ -418,68 +418,68 @@ SFRotationGetAxis(JSContext *cx,
JSBool
SFRotationInverse(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationMultiply(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationMultVec(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationSetAxis(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationSlerp(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFRotationConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool SFRotationGetAxis(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationInverse(JSContext *cx, uintN argc, jsval *vp); /* not implemented */
-JSBool SFRotationMultiply(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationMultVec(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationSetAxis(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationSlerp(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFRotationConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFRotationGetAxis(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationInverse(JSContext *cx, unsigned argc, jsval *vp); /* not implemented */
+JSBool SFRotationMultiply(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationMultVec(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationSetAxis(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationSlerp(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFRotationConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
@@ -509,42 +509,42 @@ SFRotationSetProperty(JSContext *cx,
JSBool
SFVec2fAdd(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fDivide(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fDot(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fLength(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fMultiply(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
/* JSBool
SFVec2fNegate(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
*/
@@ -552,49 +552,49 @@ SFVec2fNegate(JSContext *cx,
JSBool
SFVec2fNormalize(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fSubtract(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
SFVec2fConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool SFVec2fAdd(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fDivide(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fDot(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fLength(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fMultiply(JSContext *cx, uintN argc, jsval *vp);
-/* JSBool SFVec2fNegate(JSContext *cx, uintN argc, jsval *vp); */
-JSBool SFVec2fNormalize(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fSubtract(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec2fConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFVec2fAdd(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fDivide(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fDot(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fLength(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fMultiply(JSContext *cx, unsigned argc, jsval *vp);
+/* JSBool SFVec2fNegate(JSContext *cx, unsigned argc, jsval *vp); */
+JSBool SFVec2fNormalize(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fSubtract(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec2fConstr(JSContext *cx, unsigned argc, jsval *vp);
#endif
JSBool
@@ -620,90 +620,90 @@ SFVec2fSetProperty(JSContext *cx,
#if JS_VERSION < 185
-JSBool SFVec3fAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fCross(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fDivide(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fDot(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fMultiply(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fNegate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fNormalize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fSubtract(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool SFVec3fAdd(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fCross(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fDivide(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fDot(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fLength(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fMultiply(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fNegate(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fNormalize(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fSubtract(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3fConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool SFVec3fGetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
JSBool SFVec3fSetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
#else
-JSBool SFVec3fAdd(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fCross(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fDivide(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fDot(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fLength(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fMultiply(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fNegate(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fNormalize(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fSubtract(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3fConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFVec3fAdd(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fCross(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fDivide(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fDot(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fLength(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fMultiply(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fNegate(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fNormalize(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fSubtract(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3fConstr(JSContext *cx, unsigned argc, jsval *vp);
JSBool SFVec3fGetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
JSBool SFVec3fSetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
#endif
#if JS_VERSION < 185
-JSBool SFVec3dAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dCross(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dDivide(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dDot(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dMultiply(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dNegate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dNormalize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dSubtract(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec3dConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool SFVec3dAdd(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dCross(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dDivide(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dDot(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dLength(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dMultiply(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dNegate(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dNormalize(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dSubtract(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec3dConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool SFVec3dGetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
JSBool SFVec3dSetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
#else
-JSBool SFVec3dAdd(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dCross(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dDivide(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dDot(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dLength(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dMultiply(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dNegate(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dNormalize(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dSubtract(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec3dConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFVec3dAdd(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dCross(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dDivide(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dDot(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dLength(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dMultiply(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dNegate(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dNormalize(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dSubtract(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec3dConstr(JSContext *cx, unsigned argc, jsval *vp);
JSBool SFVec3dGetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
JSBool SFVec3dSetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
#endif
#if JS_VERSION < 185
-JSBool SFVec4fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec4fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec4fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool SFVec4fToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec4fAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec4fConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool SFVec4fGetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
JSBool SFVec4fSetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-JSBool SFVec4dToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec4dAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool SFVec4dConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool SFVec4dToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec4dAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool SFVec4dConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool SFVec4dGetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
JSBool SFVec4dSetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
#else
-JSBool SFVec4fToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec4fAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec4fConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFVec4fToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec4fAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec4fConstr(JSContext *cx, unsigned argc, jsval *vp);
JSBool SFVec4fGetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
JSBool SFVec4fSetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
-JSBool SFVec4dToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec4dAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool SFVec4dConstr(JSContext *cx, uintN argc, jsval *vp);
+JSBool SFVec4dToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec4dAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool SFVec4dConstr(JSContext *cx, unsigned argc, jsval *vp);
JSBool SFVec4dGetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp);
JSBool SFVec4dSetProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
#endif
@@ -712,28 +712,28 @@ JSBool SFVec4dSetProperty(JSContext *cx,
JSBool
MFColorToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFColorAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFColorConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFColorToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFColorAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFColorConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFColorConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFColorToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFColorAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFColorConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFColorConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -773,28 +773,28 @@ MFColorSetProperty(JSContext *cx,
JSBool
MFFloatToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFFloatAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFFloatConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFFloatToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFFloatAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFFloatConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFFloatConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFFloatToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFFloatAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFFloatConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFFloatConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -834,28 +834,28 @@ MFFloatSetProperty(JSContext *cx,
JSBool
MFInt32ToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFInt32Assign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFInt32Constr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFInt32ToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFInt32Assign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFInt32Constr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFInt32ConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFInt32ToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFInt32Assign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFInt32Constr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFInt32ConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -894,28 +894,28 @@ MFInt32SetProperty(JSContext *cx,
JSBool
MFNodeToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFNodeAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFNodeConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFNodeToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFNodeAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFNodeConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFNodeConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFNodeToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFNodeAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFNodeConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFNodeConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -955,28 +955,28 @@ MFNodeSetProperty(JSContext *cx,
JSBool
MFRotationToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFRotationAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFRotationConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFRotationToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFRotationAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFRotationConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFRotationConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFRotationToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFRotationAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFRotationConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFRotationConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1015,28 +1015,28 @@ MFRotationAddProperty(JSContext *cx,
JSBool
MFStringToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFStringAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFStringConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFStringToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFStringAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFStringConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFStringConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFStringToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFStringAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFStringConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFStringConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1087,28 +1087,28 @@ JSBool MFStringConvertProperty(JSContext
JSBool
MFTimeToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFTimeAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFTimeConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFTimeToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFTimeAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFTimeConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFTimeConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFTimeToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFTimeAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFTimeConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFTimeConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1148,28 +1148,28 @@ MFTimeSetProperty(JSContext *cx,
JSBool
MFVec2fToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFVec2fAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFVec2fConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFVec2fToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec2fAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec2fConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec2fConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFVec2fToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec2fAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec2fConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec2fConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1209,28 +1209,28 @@ MFVec2fSetProperty(JSContext *cx,
JSBool
MFVec3fToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFVec3fAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
MFVec3fConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool MFVec3fToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec3fAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec3fConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool MFVec3fConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool MFVec3fToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec3fAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec3fConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool MFVec3fConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1268,46 +1268,46 @@ MFVec3fSetProperty(JSContext *cx,
JSBool
VrmlMatrixToString(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
JSBool
VrmlMatrixAssign(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
-JSBool VrmlMatrixsetTransform(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixgetTransform(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixinverse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixtranspose(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixmultLeft(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixmultRight(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixmultVecMatrix(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool VrmlMatrixmultMatrixVec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixsetTransform(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixgetTransform(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixinverse(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixtranspose(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixmultLeft(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixmultRight(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixmultVecMatrix(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixmultMatrixVec(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
JSBool
VrmlMatrixConstr(JSContext *cx,
JSObject *obj,
- uintN argc,
+ unsigned argc,
jsval *argv,
jsval *rval);
#else
-JSBool VrmlMatrixToString(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixAssign(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixsetTransform(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixgetTransform(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixinverse(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixtranspose(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixmultLeft(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixmultRight(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixmultVecMatrix(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixmultMatrixVec(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixConstr(JSContext *cx, uintN argc, jsval *vp);
-JSBool VrmlMatrixConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
+JSBool VrmlMatrixToString(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixAssign(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixsetTransform(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixgetTransform(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixinverse(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixtranspose(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixmultLeft(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixmultRight(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixmultVecMatrix(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixmultMatrixVec(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixConstr(JSContext *cx, unsigned argc, jsval *vp);
+JSBool VrmlMatrixConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval);
#endif
JSBool
@@ -1341,7 +1341,7 @@ VrmlMatrixSetProperty(JSContext *cx,
#endif
jsval *vp);
-JSBool _standardMFAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, JSClass *myClass, int type);
+JSBool _standardMFAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval, JSClass *myClass, int type);
#if JS_VERSION < 185
JSBool _standardMFGetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp, char *makeNewElement, int type);
#else
diff -up freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c.xul13 freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c
--- freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c.xul13 2012-06-25 22:26:23.550468663 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRML_MFClasses.c 2012-06-25 22:30:43.829487902 -0400
@@ -74,7 +74,7 @@ JS_MY_Finalize(JSContext *cx, JSObject *
REMOVE_ROOT(cx,obj)
- if ((ptr = (void *)JS_GetPrivate(cx, obj)) != NULL) {
+ if ((ptr = (void *)JS_GetPrivate(obj)) != NULL) {
FREE_IF_NZ(ptr);
#ifdef JSVRMLCLASSESVERBOSE
} else {
@@ -85,9 +85,9 @@ JS_MY_Finalize(JSContext *cx, JSObject *
JSBool
#if JS_VERSION < 185
-MFColorToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFColorToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFColorToString(JSContext *cx, uintN argc, jsval *vp) {
+MFColorToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -105,10 +105,10 @@ MFColorToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-MFColorAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFColorAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
return _standardMFAssign (cx, obj, argc, argv, rval, &MFColorClass,FIELDTYPE_SFColor);
#else
-MFColorAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFColorAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -120,9 +120,9 @@ MFColorAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-MFColorConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFColorConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFColorConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFColorConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFColorClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -130,7 +130,7 @@ MFColorConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFColorConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFColorConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
JSObject *_obj;
unsigned int i;
@@ -156,7 +156,7 @@ JSBool MFColorConstrInternals(JSContext
CHECK_CLASS(cx,_obj,NULL,__FUNCTION__,SFColorClass)
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFColorConstr.\n", i);
return JS_FALSE;
}
@@ -195,9 +195,9 @@ MFColorSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-MFFloatToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFFloatToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFFloatToString(JSContext *cx, uintN argc, jsval *vp) {
+MFFloatToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -215,9 +215,9 @@ MFFloatToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-MFFloatAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFFloatAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFFloatAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFFloatAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -235,9 +235,9 @@ MFFloatAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-MFFloatConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFFloatConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFFloatConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFFloatConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFFloatClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -245,10 +245,10 @@ MFFloatConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFFloatConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFFloatConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
- jsdouble _d;
+ double _d;
unsigned int i;
ADD_ROOT(cx,obj)
@@ -268,7 +268,7 @@ JSBool MFFloatConstrInternals(JSContext
return JS_FALSE;
}
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFFloatConstr.\n", i);
return JS_FALSE;
}
@@ -308,9 +308,9 @@ MFFloatSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-MFInt32ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFInt32ToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFInt32ToString(JSContext *cx, uintN argc, jsval *vp) {
+MFInt32ToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -332,9 +332,9 @@ MFInt32ToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-MFInt32Assign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFInt32Assign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFInt32Assign(JSContext *cx, uintN argc, jsval *vp) {
+MFInt32Assign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -357,9 +357,9 @@ MFInt32Assign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-MFInt32Constr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFInt32Constr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFInt32Constr(JSContext *cx, uintN argc, jsval *vp) {
+MFInt32Constr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFInt32Class,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -367,9 +367,9 @@ MFInt32Constr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFInt32ConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFInt32ConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
- int32 _i;
+ int32_t _i;
unsigned int i;
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of MFInt32Constr\n");
@@ -397,7 +397,7 @@ JSBool MFInt32ConstrInternals(JSContext
printf ("value at %d is %d\n",i,_i);
#endif
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFInt32Constr.\n", i);
return JS_FALSE;
}
@@ -450,9 +450,9 @@ MFInt32SetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-MFNodeToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFNodeToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFNodeToString(JSContext *cx, uintN argc, jsval *vp) {
+MFNodeToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -474,9 +474,9 @@ MFNodeToString(JSContext *cx, uintN argc
JSBool
#if JS_VERSION < 185
-MFNodeAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFNodeAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFNodeAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFNodeAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -496,9 +496,9 @@ MFNodeAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-MFNodeConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFNodeConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFNodeConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFNodeConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFNodeClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -506,7 +506,7 @@ MFNodeConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFNodeConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFNodeConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
JSObject *_obj;
unsigned int i;
@@ -532,7 +532,7 @@ JSBool MFNodeConstrInternals(JSContext *
CHECK_CLASS(cx,_obj,argv,__FUNCTION__,SFNodeClass)
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in MFNodeConstr.\n", i);
return JS_FALSE;
}
@@ -615,9 +615,9 @@ MFTimeSetProperty(JSContext *cx, JSObjec
JSBool
#if JS_VERSION < 185
-MFTimeToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFTimeToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFTimeToString(JSContext *cx, uintN argc, jsval *vp) {
+MFTimeToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -635,9 +635,9 @@ MFTimeToString(JSContext *cx, uintN argc
JSBool
#if JS_VERSION < 185
-MFTimeConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFTimeConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFTimeConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFTimeConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFTimeClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -645,9 +645,9 @@ MFTimeConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFTimeConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFTimeConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
- jsdouble _d;
+ double _d;
unsigned int i;
ADD_ROOT(cx,obj)
@@ -668,7 +668,7 @@ JSBool MFTimeConstrInternals(JSContext *
return JS_FALSE;
}
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in MFTimeConstr.\n", i);
return JS_FALSE;
}
@@ -679,9 +679,9 @@ JSBool MFTimeConstrInternals(JSContext *
JSBool
#if JS_VERSION < 185
-MFTimeAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFTimeAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFTimeAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFTimeAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -729,9 +729,9 @@ MFVec2fSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-MFVec2fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec2fToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFVec2fToString(JSContext *cx, uintN argc, jsval *vp) {
+MFVec2fToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -749,9 +749,9 @@ MFVec2fToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-MFVec2fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec2fConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFVec2fConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFVec2fConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFVec2fClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -759,7 +759,7 @@ MFVec2fConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFVec2fConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFVec2fConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
JSObject *_obj;
unsigned int i;
@@ -783,7 +783,7 @@ JSBool MFVec2fConstrInternals(JSContext
CHECK_CLASS(cx,_obj,NULL,__FUNCTION__,SFVec2fClass)
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in MFVec2fConstr.\n", i);
return JS_FALSE;
}
@@ -794,10 +794,10 @@ JSBool MFVec2fConstrInternals(JSContext
JSBool
#if JS_VERSION < 185
-MFVec2fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec2fAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
return _standardMFAssign (cx, obj, argc, argv, rval, &MFVec2fClass,FIELDTYPE_SFVec2f);
#else
-MFVec2fAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFVec2fAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -838,9 +838,9 @@ MFVec3fSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-MFVec3fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec3fToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFVec3fToString(JSContext *cx, uintN argc, jsval *vp) {
+MFVec3fToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -859,9 +859,9 @@ MFVec3fToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-MFVec3fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec3fConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFVec3fConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFVec3fConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFVec3fClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -869,7 +869,7 @@ MFVec3fConstr(JSContext *cx, uintN argc,
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFVec3fConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFVec3fConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
JSObject *_obj;
unsigned int i;
@@ -892,7 +892,7 @@ JSBool MFVec3fConstrInternals(JSContext
CHECK_CLASS(cx,_obj,NULL,__FUNCTION__,SFVec3fClass)
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in MFVec3fConstr.\n", i);
return JS_FALSE;
}
@@ -903,10 +903,10 @@ JSBool MFVec3fConstrInternals(JSContext
JSBool
#if JS_VERSION < 185
-MFVec3fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFVec3fAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
return _standardMFAssign (cx, obj, argc, argv, rval, &MFVec3fClass,FIELDTYPE_SFVec3f);
#else
-MFVec3fAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFVec3fAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -928,7 +928,7 @@ static void _setmatrix (JSContext *cx, J
return;
}
- if (!JS_SetElement(cx, obj, (jsint) i, &val)) {
+ if (!JS_SetElement(cx, obj, (uint32_t) i, &val)) {
printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i);
return;
}
@@ -937,7 +937,7 @@ static void _setmatrix (JSContext *cx, J
/* get the matrix values into a double array */
static void _getmatrix (JSContext *cx, JSObject *obj, double *fl) {
- int32 _length;
+ int32_t _length;
jsval _length_val;
jsval val;
int i;
@@ -958,7 +958,7 @@ static void _getmatrix (JSContext *cx, J
if (_length>16) _length = 16;
for (i = 0; i < _length; i++) {
- if (!JS_GetElement(cx, obj, (jsint) i, &val)) {
+ if (!JS_GetElement(cx, obj, (uint32_t) i, &val)) {
printf( "failed in get of copyElements index %d.\n", i);
fl[i] = 0.0;
} else {
@@ -978,9 +978,9 @@ static void _getmatrix (JSContext *cx, J
JSBool
#if JS_VERSION < 185
-VrmlMatrixToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixToString(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -1013,9 +1013,9 @@ void _set4f(double len, double *mat, int
JSBool
#if JS_VERSION < 185
-VrmlMatrixgetTransform(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixgetTransform(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixgetTransform(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixgetTransform(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1067,7 +1067,7 @@ VrmlMatrixgetTransform(JSContext *cx, ui
if (transObj!=NULL) {
CHECK_CLASS(cx,transObj,NULL,__FUNCTION__,SFVec3fClass)
- if ((Vptr = (SFVec3fNative *)JS_GetPrivate(cx, transObj)) == NULL) {
+ if ((Vptr = (SFVec3fNative *)JS_GetPrivate(transObj)) == NULL) {
printf( "JS_GetPrivate failed.\n");
return JS_FALSE;
}
@@ -1082,7 +1082,7 @@ VrmlMatrixgetTransform(JSContext *cx, ui
CHECK_CLASS(cx,rotObj,NULL,__FUNCTION__,SFRotationClass)
- if ((Rptr = (SFRotationNative*)JS_GetPrivate(cx, rotObj)) == NULL) {
+ if ((Rptr = (SFRotationNative*)JS_GetPrivate(rotObj)) == NULL) {
printf( "JS_GetPrivate failed.\n");
return JS_FALSE;
}
@@ -1110,7 +1110,7 @@ VrmlMatrixgetTransform(JSContext *cx, ui
if (scaleObj != NULL) {
CHECK_CLASS(cx,scaleObj,NULL,__FUNCTION__,SFVec3fClass)
- if ((Vptr = (SFVec3fNative*)JS_GetPrivate(cx, scaleObj)) == NULL) {
+ if ((Vptr = (SFVec3fNative*)JS_GetPrivate(scaleObj)) == NULL) {
printf( "JS_GetPrivate failed.\n");
return JS_FALSE;
}
@@ -1137,9 +1137,9 @@ VrmlMatrixgetTransform(JSContext *cx, ui
JSBool
#if JS_VERSION < 185
-VrmlMatrixsetTransform(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixsetTransform(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixsetTransform(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixsetTransform(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1216,7 +1216,7 @@ VrmlMatrixsetTransform(JSContext *cx, ui
/* apply Transform, if requested */
if (transObj) {
SFVec3fNative * Vptr;
- Vptr = (SFVec3fNative *)JS_GetPrivate(cx, transObj);
+ Vptr = (SFVec3fNative *)JS_GetPrivate(transObj);
error = (Vptr == NULL);
if (!error) {
@@ -1228,7 +1228,7 @@ VrmlMatrixsetTransform(JSContext *cx, ui
if (!error && (rotObj != NULL)) {
SFRotationNative * Rptr;
- Rptr = (SFRotationNative *)JS_GetPrivate(cx, rotObj);
+ Rptr = (SFRotationNative *)JS_GetPrivate(rotObj);
error = (Rptr == NULL);
if (!error) {
@@ -1242,7 +1242,7 @@ VrmlMatrixsetTransform(JSContext *cx, ui
if (!error && (scaleObj != NULL)) {
SFVec3fNative * Vptr;
- Vptr = (SFVec3fNative *)JS_GetPrivate(cx, scaleObj);
+ Vptr = (SFVec3fNative *)JS_GetPrivate(scaleObj);
error = (Vptr == NULL);
if (!error) {
@@ -1282,9 +1282,9 @@ VrmlMatrixsetTransform(JSContext *cx, ui
JSBool
#if JS_VERSION < 185
-VrmlMatrixinverse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixinverse(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixinverse(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixinverse(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1300,7 +1300,7 @@ VrmlMatrixinverse(JSContext *cx, uintN a
_getmatrix (cx, obj,src);
matinverse (dest,src);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass,NULL, NULL);
+ retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
_setmatrix(cx,retObj,dest);
#if JS_VERSION < 185
@@ -1314,9 +1314,9 @@ VrmlMatrixinverse(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-VrmlMatrixtranspose(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixtranspose(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixtranspose(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixtranspose(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1332,7 +1332,7 @@ VrmlMatrixtranspose(JSContext *cx, uintN
_getmatrix (cx, obj,src);
mattranspose (dest,src);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass,NULL, NULL);
+ retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
_setmatrix(cx,retObj,dest);
#if JS_VERSION < 185
@@ -1347,9 +1347,9 @@ VrmlMatrixtranspose(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-VrmlMatrixmultLeft(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixmultLeft(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixmultLeft(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixmultLeft(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1376,7 +1376,7 @@ VrmlMatrixmultLeft(JSContext *cx, uintN
_getmatrix(cx,transObj,matrix2);
matmultiply(matrix1,matrix1,matrix2);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass,NULL, NULL);
+ retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
/*
printf ("multLeft calculated Matrix: \n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n",
@@ -1397,9 +1397,9 @@ VrmlMatrixmultLeft(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-VrmlMatrixmultRight(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixmultRight(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixmultRight(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixmultRight(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1426,7 +1426,7 @@ VrmlMatrixmultRight(JSContext *cx, uintN
_getmatrix(cx,transObj,matrix2);
matmultiply(matrix1,matrix2,matrix1);
- retObj = JS_ConstructObject(cx,&VrmlMatrixClass,NULL, NULL);
+ retObj = JS_ConstructObject(cx,&VrmlMatrixClass, NULL);
/*
printf ("multRight calculated Matrix: \n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n\t%5.2f %5.2f %5.2f %5.2f\n",
@@ -1448,9 +1448,9 @@ VrmlMatrixmultRight(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-VrmlMatrixmultVecMatrix(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixmultVecMatrix(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixmultVecMatrix(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixmultVecMatrix(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1468,7 +1468,7 @@ VrmlMatrixmultVecMatrix(JSContext *cx, u
if (!error) if (!JS_InstanceOf(cx, transObj, &SFVec3fClass, NULL)) { error = TRUE;}
- if ((Vptr = (SFVec3fNative *)JS_GetPrivate(cx, transObj)) == NULL) {
+ if ((Vptr = (SFVec3fNative *)JS_GetPrivate(transObj)) == NULL) {
error = TRUE;
}
@@ -1487,8 +1487,8 @@ VrmlMatrixmultVecMatrix(JSContext *cx, u
matrotate2v(matrix1, inp, outp);
- retObj = JS_ConstructObject(cx,&SFVec3fClass,NULL, NULL);
- if ((Vptr = (SFVec3fNative *)JS_GetPrivate(cx, retObj)) == NULL) {
+ retObj = JS_ConstructObject(cx,&SFVec3fClass, NULL);
+ if ((Vptr = (SFVec3fNative *)JS_GetPrivate(retObj)) == NULL) {
printf ("error in new VrmlMatrix\n");
return JS_FALSE;
}
@@ -1506,9 +1506,9 @@ VrmlMatrixmultVecMatrix(JSContext *cx, u
JSBool
#if JS_VERSION < 185
-VrmlMatrixmultMatrixVec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixmultMatrixVec(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixmultMatrixVec(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixmultMatrixVec(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1526,7 +1526,7 @@ VrmlMatrixmultMatrixVec(JSContext *cx, u
if (!error) if (!JS_InstanceOf(cx, transObj, &SFVec3fClass, NULL)) { error = TRUE;}
- if ((Vptr = (SFVec3fNative *)JS_GetPrivate(cx, transObj)) == NULL) {
+ if ((Vptr = (SFVec3fNative *)JS_GetPrivate(transObj)) == NULL) {
error = TRUE;
}
@@ -1545,8 +1545,8 @@ VrmlMatrixmultMatrixVec(JSContext *cx, u
matrotate2v(matrix1, inp, outp);
- retObj = JS_ConstructObject(cx,&SFVec3fClass,NULL, NULL);
- if ((Vptr = (SFVec3fNative *)JS_GetPrivate(cx, retObj)) == NULL) {
+ retObj = JS_ConstructObject(cx,&SFVec3fClass, NULL);
+ if ((Vptr = (SFVec3fNative *)JS_GetPrivate(retObj)) == NULL) {
printf ("error in new VrmlMatrix\n");
return JS_FALSE;
}
@@ -1564,10 +1564,10 @@ VrmlMatrixmultMatrixVec(JSContext *cx, u
JSBool
#if JS_VERSION < 185
-VrmlMatrixAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
return _standardMFAssign (cx, obj, argc, argv, rval, &VrmlMatrixClass,FIELDTYPE_FreeWRLPTR/*does not matter*/);
#else
-VrmlMatrixAssign(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -1579,9 +1579,9 @@ VrmlMatrixAssign(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
-VrmlMatrixConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+VrmlMatrixConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-VrmlMatrixConstr(JSContext *cx, uintN argc, jsval *vp) {
+VrmlMatrixConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&VrmlMatrixClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -1589,9 +1589,9 @@ VrmlMatrixConstr(JSContext *cx, uintN ar
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool VrmlMatrixConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool VrmlMatrixConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
- jsdouble _d;
+ double _d;
unsigned int i;
ADD_ROOT(cx,obj)
@@ -1611,7 +1611,7 @@ JSBool VrmlMatrixConstrInternals(JSConte
return JS_FALSE;
}
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %u in VrmlMatrixConstr.\n", i);
return JS_FALSE;
}
@@ -1642,7 +1642,7 @@ VrmlMatrixGetProperty(JSContext *cx, JSO
VrmlMatrixGetProperty(JSContext *cx, JSObject *obj, jsid iid, jsval *vp)
#endif
{
- int32 _length, _index;
+ int32_t _length, _index;
jsval _length_val;
#if JS_VERSION >= 185
@@ -1682,7 +1682,7 @@ VrmlMatrixGetProperty(JSContext *cx, JSO
if (_index >= _length) {
JS_NewNumberValue(cx,0.0,vp);
- if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n");
return JS_FALSE;
}
@@ -1744,9 +1744,9 @@ MFRotationSetProperty(JSContext *cx, JSO
JSBool
#if JS_VERSION < 185
-MFRotationToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFRotationToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFRotationToString(JSContext *cx, uintN argc, jsval *vp) {
+MFRotationToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -1764,9 +1764,9 @@ MFRotationToString(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-MFRotationConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFRotationConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFRotationConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFRotationConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFRotationClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -1774,7 +1774,7 @@ MFRotationConstr(JSContext *cx, uintN ar
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFRotationConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFRotationConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
JSObject *_obj;
unsigned int i;
@@ -1798,7 +1798,7 @@ JSBool MFRotationConstrInternals(JSConte
CHECK_CLASS(cx,_obj,NULL,__FUNCTION__,SFRotationClass)
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in MFRotationConstr.\n", i);
return JS_FALSE;
}
@@ -1809,10 +1809,10 @@ JSBool MFRotationConstrInternals(JSConte
JSBool
#if JS_VERSION < 185
-MFRotationAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFRotationAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
return _standardMFAssign (cx, obj, argc, argv, rval, &MFRotationClass,FIELDTYPE_SFRotation);
#else
-MFRotationAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFRotationAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -1900,7 +1900,7 @@ MFStringGetProperty(JSContext *cx, JSObj
#endif
{
JSString *_str;
- int32 _length, _index;
+ int32_t _length, _index;
jsval _length_val;
#if JS_VERSION >= 185
jsval id;
@@ -1926,7 +1926,7 @@ MFStringGetProperty(JSContext *cx, JSObj
if (_index >= _length) {
_str = JS_NewStringCopyZ(cx, "");
*vp = STRING_TO_JSVAL(_str);
- if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed in MFStringGetProperty.\n");
return JS_FALSE;
}
@@ -1940,7 +1940,7 @@ MFStringGetProperty(JSContext *cx, JSObj
/* printf ("MFStringGetProperty, element %d is JSVAL_VOID, making up string for it\n",_index); */
_str = JS_NewStringCopyZ(cx, "NULL");
*vp = STRING_TO_JSVAL(_str);
- if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed in MFStringGetProperty.\n");
return JS_FALSE;
}
@@ -1992,9 +1992,9 @@ printf ("MFStringSetProperty, setting vp
JSBool
#if JS_VERSION < 185
-MFStringToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFStringToString(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFStringToString(JSContext *cx, uintN argc, jsval *vp) {
+MFStringToString(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2018,9 +2018,9 @@ MFStringToString(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
-MFStringConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFStringConstr(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFStringConstr(JSContext *cx, uintN argc, jsval *vp) {
+MFStringConstr(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&MFStringClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
jsval rval = OBJECT_TO_JSVAL(obj);
@@ -2028,7 +2028,7 @@ MFStringConstr(JSContext *cx, uintN argc
JS_SET_RVAL(cx,vp,rval);
return JS_TRUE;
}
-JSBool MFStringConstrInternals(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+JSBool MFStringConstrInternals(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#endif
unsigned int i;
@@ -2077,7 +2077,7 @@ JSBool MFStringConstrInternals(JSContext
#endif
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in MFStringConstr.\n", i);
return JS_FALSE;
}
@@ -2093,9 +2093,9 @@ JSBool MFStringConstrInternals(JSContext
JSBool
#if JS_VERSION < 185
-MFStringAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+MFStringAssign(JSContext *cx, JSObject *obj, unsigned argc, jsval *argv, jsval *rval) {
#else
-MFStringAssign(JSContext *cx, uintN argc, jsval *vp) {
+MFStringAssign(JSContext *cx, unsigned argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
diff -up freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.xul13 freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c
--- freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.xul13 2012-06-25 22:31:16.310490303 -0400
+++ freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c 2012-06-25 22:43:30.693544584 -0400
@@ -127,9 +127,9 @@ void convertHSVtoRGB( double h, double s
JSBool
#if JS_VERSION < 185
-SFColorGetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorGetHSV(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorGetHSV(JSContext *cx, uintN argc, jsval *vp) {
+SFColorGetHSV(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -146,7 +146,7 @@ SFColorGetHSV(JSContext *cx, uintN argc,
}
/* get the RGB values */
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorToString.\n");
return JS_FALSE;
}
@@ -166,7 +166,7 @@ SFColorGetHSV(JSContext *cx, uintN argc,
printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]);
return JS_FALSE;
}
- JS_SetElement(cx, result, (jsint)i, &_v);
+ JS_SetElement(cx, result, (uint32_t)i, &_v);
}
/* JAS - should we remove this here, or on finalize? JS_RemoveRoot(cx, &result); */
@@ -180,9 +180,9 @@ SFColorGetHSV(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFColorSetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorSetHSV(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorSetHSV(JSContext *cx, uintN argc, jsval *vp) {
+SFColorSetHSV(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -190,7 +190,7 @@ SFColorSetHSV(JSContext *cx, uintN argc,
double hue, saturation, value;
double red,green,blue;
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorToString.\n");
return JS_FALSE;
}
@@ -225,9 +225,9 @@ SFColorSetHSV(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFColorToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorToString(JSContext *cx, uintN argc, jsval *vp) {
+SFColorToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -237,7 +237,7 @@ SFColorToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorToString.\n");
return JS_FALSE;
}
@@ -256,9 +256,9 @@ SFColorToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFColorAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFColorAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -267,7 +267,7 @@ SFColorAssign(JSContext *cx, uintN argc,
SFColorNative *ptr, *fptr;
char *_id_str;
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFColorAssign.\n");
return JS_FALSE;
}
@@ -288,7 +288,7 @@ SFColorAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFColorClass)
- if ((fptr = (SFColorNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFColorNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFColorAssign.\n");
return JS_FALSE;
}
@@ -308,14 +308,14 @@ SFColorAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFColorConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFColorConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFColorClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFColorNative *ptr;
- jsdouble pars[3];
+ double pars[3];
ADD_ROOT(cx,obj)
@@ -329,10 +329,7 @@ SFColorConstr(JSContext *cx, uintN argc,
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFColorConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -372,7 +369,7 @@ SFColorGetProperty(JSContext *cx, JSObje
#endif
{
SFColorNative *ptr;
- jsdouble d;
+ double d;
#if JS_VERSION >= 185
jsval id;
if (!JS_IdToValue(cx,iid,&id)) {
@@ -381,7 +378,7 @@ SFColorGetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorGetProperty.\n");
return JS_FALSE;
}
@@ -436,7 +433,7 @@ SFColorSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFColorNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorSetProperty.\n");
return JS_FALSE;
}
@@ -483,16 +480,16 @@ SFColorSetProperty(JSContext *cx, JSObje
/* copy code from SFColorGetHSV if the spec ever decides to implement this. */
JSBool
#if JS_VERSION < 185
-SFColorRGBAGetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorRGBAGetHSV(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorRGBAGetHSV(JSContext *cx, uintN argc, jsval *vp) {
+SFColorRGBAGetHSV(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
JSObject *_arrayObj;
- jsdouble hue = 0, saturation = 0, value = 0;
+ double hue = 0, saturation = 0, value = 0;
jsval _v;
UNUSED(obj);
@@ -533,17 +530,17 @@ SFColorRGBAGetHSV(JSContext *cx, uintN a
/* implement later?? Copy most of code from SFColorSetHSV if we require this */
JSBool
#if JS_VERSION < 185
-SFColorRGBASetHSV(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorRGBASetHSV(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorRGBASetHSV(JSContext *cx, uintN argc, jsval *vp) {
+SFColorRGBASetHSV(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFColorRGBANative *ptr;
- jsdouble hue, saturation, value;
+ double hue, saturation, value;
- if ((ptr = (SFColorRGBANative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorRGBANative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorRGBAToString.\n");
return JS_FALSE;
}
@@ -566,9 +563,9 @@ SFColorRGBASetHSV(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFColorRGBAToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorRGBAToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorRGBAToString(JSContext *cx, uintN argc, jsval *vp) {
+SFColorRGBAToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -579,7 +576,7 @@ SFColorRGBAToString(JSContext *cx, uintN
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFColorRGBANative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorRGBANative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorRGBAToString.\n");
return JS_FALSE;
}
@@ -600,9 +597,9 @@ SFColorRGBAToString(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-SFColorRGBAAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorRGBAAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorRGBAAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFColorRGBAAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -612,7 +609,7 @@ SFColorRGBAAssign(JSContext *cx, uintN a
SFColorRGBANative *ptr, *fptr;
char *_id_str;
- if ((ptr = (SFColorRGBANative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorRGBANative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFColorRGBAAssign.\n");
return JS_FALSE;
}
@@ -632,7 +629,7 @@ SFColorRGBAAssign(JSContext *cx, uintN a
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFColorRGBAClass)
- if ((fptr = (SFColorRGBANative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFColorRGBANative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFColorRGBAAssign.\n");
return JS_FALSE;
}
@@ -654,15 +651,15 @@ SFColorRGBAAssign(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFColorRGBAConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFColorRGBAConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFColorRGBAConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFColorRGBAConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFColorRGBAClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFColorRGBANative *ptr;
- jsdouble pars[4];
+ double pars[4];
ADD_ROOT(cx,obj)
@@ -676,10 +673,7 @@ SFColorRGBAConstr(JSContext *cx, uintN a
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFColorRGBAConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -722,7 +716,7 @@ SFColorRGBAGetProperty(JSContext *cx, JS
#endif
{
SFColorRGBANative *ptr;
- jsdouble d;
+ double d;
#if JS_VERSION >= 185
jsval id;
if (!JS_IdToValue(cx,iid,&id)) {
@@ -731,7 +725,7 @@ SFColorRGBAGetProperty(JSContext *cx, JS
}
#endif
- if ((ptr = (SFColorRGBANative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorRGBANative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorRGBAGetProperty.\n");
return JS_FALSE;
}
@@ -795,7 +789,7 @@ SFColorRGBASetProperty(JSContext *cx, JS
}
#endif
- if ((ptr = (SFColorRGBANative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFColorRGBANative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFColorRGBASetProperty.\n");
return JS_FALSE;
}
@@ -848,9 +842,9 @@ SFColorRGBASetProperty(JSContext *cx, JS
JSBool
#if JS_VERSION < 185
-SFImageToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFImageToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFImageToString(JSContext *cx, uintN argc, jsval *vp) {
+SFImageToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -875,9 +869,9 @@ SFImageToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFImageAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFImageAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFImageAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFImageAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -899,9 +893,9 @@ SFImageAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFImageConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFImageConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFImageConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFImageConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFImageClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -925,10 +919,7 @@ SFImageConstr(JSContext *cx, uintN argc,
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFImageConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
ptr->valueChanged = 1;
@@ -958,7 +949,7 @@ SFImageConstr(JSContext *cx, uintN argc,
MFInt32ConstrInternals(cx, obj, 0, NULL, &mv);
#endif
}
- if (!JS_DefineElement(cx, obj, (jsint) i, mv, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB6, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, mv, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB6, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in SFImageConstr.\n", i);
return JS_FALSE;
}
@@ -1035,7 +1026,7 @@ SFImageConstr(JSContext *cx, uintN argc,
/* parameters are ok - just save them now in the new object. */
for (i=0; i<argc; i++) {
- if (!JS_DefineElement(cx, obj, (jsint) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB6, JSPROP_ENUMERATE)) {
+ if (!JS_DefineElement(cx, obj, (uint32_t) i, argv[i], JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB6, JSPROP_ENUMERATE)) {
printf( "JS_DefineElement failed for arg %d in SFImageConstr.\n", i);
return JS_FALSE;
}
@@ -1075,9 +1066,9 @@ SFImageSetProperty(JSContext *cx, JSObje
/* returns a string rep of the pointer to the node in memory */
JSBool
#if JS_VERSION < 185
-SFNodeToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFNodeToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFNodeToString(JSContext *cx, uintN argc, jsval *vp) {
+SFNodeToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rvalinst;
@@ -1090,7 +1081,7 @@ SFNodeToString(JSContext *cx, uintN argc
#ifdef JSVRMLCLASSESVERBOSE
printf ("SFNODETOSTRING\n");
#endif
- if ((ptr = (SFNodeNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFNodeToString.\n");
return JS_FALSE;
}
@@ -1105,7 +1096,7 @@ SFNodeToString(JSContext *cx, uintN argc
32 and 64 bits - tests/46.wrl will use this path, btw */
{
- jsdouble nv;
+ double nv;
char tmpline[100];
sprintf (tmpline,"%ld",(long int) ptr->handle);
/* sprintf (tmpline,"%ld",ptr->handle); */
@@ -1139,9 +1130,9 @@ SFNodeToString(JSContext *cx, uintN argc
JSBool
#if JS_VERSION < 185
-SFNodeAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFNodeAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFNodeAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFNodeAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -1160,7 +1151,7 @@ SFNodeAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,obj,argv,__FUNCTION__,SFNodeClass)
/* get the pointer to the internal stuff */
- if ((ptr = (SFNodeNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFNodeAssign.\n");
return JS_FALSE;
}
@@ -1183,7 +1174,7 @@ SFNodeAssign(JSContext *cx, uintN argc,
if (_from_obj != NULL) {
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFNodeClass)
- if ((fptr = (SFNodeNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFNodeNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFNodeAssign.\n");
return JS_FALSE;
}
@@ -1215,9 +1206,9 @@ SFNodeAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFNodeConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFNodeConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFNodeConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFNodeConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFNodeClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1261,7 +1252,7 @@ SFNodeConstr(JSContext *cx, uintN argc,
printf ("SFNodeConstr, cstring was an object\n");
#endif
- if ((oldPtr = (SFNodeNative *)JS_GetPrivate(cx, JSVAL_TO_OBJECT(argv[0]))) == NULL) {
+ if ((oldPtr = (SFNodeNative *)JS_GetPrivate(JSVAL_TO_OBJECT(argv[0]))) == NULL) {
#ifdef JSVRMLCLASSESVERBOSE
printf( "JS_GetPrivate failed in SFNodeConstr.\n");
#endif
@@ -1384,10 +1375,7 @@ SFNodeConstr(JSContext *cx, uintN argc,
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, newPtr)) {
- printf( "JS_SetPrivate failed in SFNodeConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, newPtr);
newPtr->handle = newHandle;
newPtr->X3DString = (char *)STRDUP(cString);
@@ -1447,7 +1435,7 @@ SFNodeFinalize(JSContext *cx, JSObject *
will cause the following JS_GetPrivate to fail. */
- if ((ptr = (SFNodeNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
/* see above printf( "JS_GetPrivate failed in SFNodeFinalize.\n"); */
return;
} else {
@@ -1497,7 +1485,7 @@ SFNodeGetProperty(JSContext *cx, JSObjec
if (strcmp ("assign",_id_c) == 0) return JS_TRUE;
/* get the private pointer for this node */
- if ((ptr = (SFNodeNative *)JS_GetPrivate(cx, obj)) != NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) != NULL) {
#ifdef JSVRMLCLASSESVERBOSE
printf ("SFNodeGetProperty, working on node %p, field %s\n",ptr->handle,_id_c);
#endif
@@ -1611,7 +1599,7 @@ SFNodeSetProperty(JSContext *cx, JSObjec
#endif
- if ((ptr = (SFNodeNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFNodeNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFNodeSetProperty.\n");
return JS_FALSE;
}
@@ -1846,9 +1834,9 @@ SFNodeSetProperty(JSContext *cx, JSObjec
JSBool
#if JS_VERSION < 185
-SFRotationGetAxis(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationGetAxis(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationGetAxis(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationGetAxis(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1862,7 +1850,7 @@ SFRotationGetAxis(JSContext *cx, uintN a
printf ("start of SFRotationGetAxis\n");
#endif
- if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, NULL, NULL)) == NULL) {
+ if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, NULL)) == NULL) {
printf( "JS_ConstructObject failed in SFRotationGetAxis.\n");
return JS_FALSE;
}
@@ -1873,12 +1861,12 @@ SFRotationGetAxis(JSContext *cx, uintN a
JS_SET_RVAL(cx,vp,OBJECT_TO_JSVAL(_retObj));
#endif
- if ((_rot = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationGetAxis.\n");
return JS_FALSE;
}
- if ((_retNative = (SFVec3fNative *)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFVec3fNative *)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationGetAxis.\n");
return JS_FALSE;
}
@@ -1900,9 +1888,9 @@ SFRotationGetAxis(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFRotationInverse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationInverse(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationInverse(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationInverse(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1917,11 +1905,11 @@ SFRotationInverse(JSContext *cx, uintN a
printf ("start of SFRotationInverse\n");
#endif
- if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ if ((_proto = JS_GetPrototype(obj)) == NULL) {
printf( "JS_GetPrototype failed in SFRotationInverse.\n");
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFRotationInverse.\n");
return JS_FALSE;
}
@@ -1931,12 +1919,12 @@ SFRotationInverse(JSContext *cx, uintN a
JS_SET_RVAL(cx,vp,OBJECT_TO_JSVAL(_retObj));
#endif
- if ((_rot = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationInverse.\n");
return JS_FALSE;
}
- if ((_retNative = (SFRotationNative *)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFRotationNative *)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationInverse.\n");
return JS_FALSE;
}
@@ -1965,9 +1953,9 @@ SFRotationInverse(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFRotationMultiply(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationMultiply(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationMultiply(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationMultiply(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -1986,12 +1974,12 @@ SFRotationMultiply(JSContext *cx, uintN
}
CHECK_CLASS(cx,_multObj,argv,__FUNCTION__,SFRotationClass)
- if ((_proto = JS_GetPrototype(cx, _multObj)) == NULL) {
+ if ((_proto = JS_GetPrototype(_multObj)) == NULL) {
printf( "JS_GetPrototype failed in SFRotationMultiply.\n");
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFRotationMultiply.\n");
return JS_FALSE;
}
@@ -2003,17 +1991,17 @@ SFRotationMultiply(JSContext *cx, uintN
JS_SET_RVAL(cx,vp,OBJECT_TO_JSVAL(_retObj));
#endif
- if ((_rot1 = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot1 = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationMultiply.\n");
return JS_FALSE;
}
- if ((_rot2 = (SFRotationNative *)JS_GetPrivate(cx, _multObj)) == NULL) {
+ if ((_rot2 = (SFRotationNative *)JS_GetPrivate(_multObj)) == NULL) {
printf( "JS_GetPrivate failed for _multObj in SFRotationMultiply.\n");
return JS_FALSE;
}
- if ((_retNative = (SFRotationNative *)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFRotationNative *)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationMultiply.\n");
return JS_FALSE;
}
@@ -2044,9 +2032,9 @@ SFRotationMultiply(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-SFRotationMultVec(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationMultVec(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationMultVec(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationMultVec(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -2067,12 +2055,12 @@ SFRotationMultVec(JSContext *cx, uintN a
CHECK_CLASS(cx,_multObj,argv,__FUNCTION__,SFVec3fClass)
- if ((_proto = JS_GetPrototype(cx, _multObj)) == NULL) {
+ if ((_proto = JS_GetPrototype(_multObj)) == NULL) {
printf( "JS_GetPrototype failed in SFRotationMultVec.\n");
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, _proto, NULL)) == NULL) {
+ if ((_retObj = JS_ConstructObject(cx, &SFVec3fClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFRotationMultVec.\n");
return JS_FALSE;
}
@@ -2083,19 +2071,19 @@ SFRotationMultVec(JSContext *cx, uintN a
JS_SET_RVAL(cx,vp,OBJECT_TO_JSVAL(_retObj));
#endif
- if ((_rot = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationMultVec.\n");
return JS_FALSE;
}
COPY_SFVEC3F_TO_POINT_XYZ(r,_rot->v.c);
angle = _rot->v.c[3];
- if ((_vec = (SFVec3fNative *)JS_GetPrivate(cx, _multObj)) == NULL) {
+ if ((_vec = (SFVec3fNative *)JS_GetPrivate(_multObj)) == NULL) {
printf( "JS_GetPrivate failed for_multObjin SFRotationMultVec.\n");
return JS_FALSE;
}
COPY_SFVEC3F_TO_POINT_XYZ(v,_vec->v.c);
- if ((_retNative = (SFVec3fNative *)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFVec3fNative *)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationMultVec.\n");
return JS_FALSE;
}
@@ -2118,9 +2106,9 @@ SFRotationMultVec(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFRotationSetAxis(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationSetAxis(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationSetAxis(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationSetAxis(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -2140,12 +2128,12 @@ SFRotationSetAxis(JSContext *cx, uintN a
CHECK_CLASS(cx,_setAxisObj,argv,__FUNCTION__,SFVec3fClass)
- if ((_rot = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationSetAxis.\n");
return JS_FALSE;
}
- if ((_vec = (SFVec3fNative *)JS_GetPrivate(cx, _setAxisObj)) == NULL) {
+ if ((_vec = (SFVec3fNative *)JS_GetPrivate(_setAxisObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationSetAxis.\n");
return JS_FALSE;
}
@@ -2174,9 +2162,9 @@ SFRotationSetAxis(JSContext *cx, uintN a
JSBool
#if JS_VERSION < 185
-SFRotationSlerp(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationSlerp(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationSlerp(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationSlerp(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rvalinst;
@@ -2185,7 +2173,7 @@ SFRotationSlerp(JSContext *cx, uintN arg
JSObject *_destObj, *_retObj, *_proto;
SFRotationNative *_rot, *_dest, *_ret;
Quaternion _quat, _quat_dest, _quat_ret;
- jsdouble t;
+ double t;
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of SFRotationSlerp\n");
@@ -2210,29 +2198,29 @@ SFRotationSlerp(JSContext *cx, uintN arg
} else if (APPROX(t, 1)) {
*rval = OBJECT_TO_JSVAL(_destObj);
} else {
- if ((_proto = JS_GetPrototype(cx, _destObj)) == NULL) {
+ if ((_proto = JS_GetPrototype(_destObj)) == NULL) {
printf( "JS_GetPrototype failed in SFRotationSlerp.\n");
return JS_FALSE;
}
- if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto, NULL)) == NULL) {
+ if ((_retObj = JS_ConstructObject(cx, &SFRotationClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFRotationSlerp.\n");
return JS_FALSE;
}
/* root the object */
*rval = OBJECT_TO_JSVAL(_retObj);
- if ((_rot = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_rot = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationSlerp.\n");
return JS_FALSE;
}
- if ((_dest = (SFRotationNative *)JS_GetPrivate(cx, _destObj)) == NULL) {
+ if ((_dest = (SFRotationNative *)JS_GetPrivate(_destObj)) == NULL) {
printf( "JS_GetPrivate failed for _destObj in SFRotationSlerp.\n");
return JS_FALSE;
}
- if ((_ret = (SFRotationNative *)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_ret = (SFRotationNative *)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFRotationSlerp.\n");
return JS_FALSE;
}
@@ -2265,9 +2253,9 @@ SFRotationSlerp(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFRotationToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationToString(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -2283,7 +2271,7 @@ SFRotationToString(JSContext *cx, uintN
ADD_ROOT (cx,ptr)
ADD_ROOT(cx,_str)
- if ((ptr = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFRotationToString.\n");
return JS_FALSE;
}
@@ -2305,9 +2293,9 @@ SFRotationToString(JSContext *cx, uintN
JSBool
#if JS_VERSION < 185
-SFRotationAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -2320,7 +2308,7 @@ SFRotationAssign(JSContext *cx, uintN ar
printf ("start of SFRotationAssign\n");
#endif
- if ((ptr = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFRotationAssign.\n");
return JS_FALSE;
}
@@ -2351,7 +2339,7 @@ SFRotationAssign(JSContext *cx, uintN ar
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFRotationClass)
- if ((fptr = (SFRotationNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFRotationNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFRotationAssign.\n");
return JS_FALSE;
}
@@ -2375,9 +2363,9 @@ SFRotationAssign(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
-SFRotationConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFRotationConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFRotationConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFRotationConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFRotationClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -2386,8 +2374,8 @@ SFRotationConstr(JSContext *cx, uintN ar
SFVec3fNative *_vec2;
SFRotationNative *ptr;
JSObject *_ob1, *_ob2;
- jsdouble pars[4];
- jsdouble doub;
+ double pars[4];
+ double doub;
float v1len, v2len;
double v12dp;
struct point_XYZ v1, v2;
@@ -2408,10 +2396,7 @@ SFRotationConstr(JSContext *cx, uintN ar
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFRotationConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0; (ptr->v).c[1] = (float) 0.0; (ptr->v).c[2] = (float) 1.0; (ptr->v).c[3] = (float) 0.0;
@@ -2425,7 +2410,7 @@ SFRotationConstr(JSContext *cx, uintN ar
CHECK_CLASS(cx,_ob1,argv,__FUNCTION__,SFVec3fClass)
- if ((_vec = (SFVec3fNative *)JS_GetPrivate(cx, _ob1)) == NULL) {
+ if ((_vec = (SFVec3fNative *)JS_GetPrivate(_ob1)) == NULL) {
printf( "JS_GetPrivate failed for arg format \"o d\" in SFRotationConstr.\n");
return JS_FALSE;
}
@@ -2438,7 +2423,7 @@ SFRotationConstr(JSContext *cx, uintN ar
CHECK_CLASS(cx,_ob2,argv,__FUNCTION__,SFVec3fClass)
- if ((_vec2 = (SFVec3fNative *)JS_GetPrivate(cx, _ob2)) == NULL) {
+ if ((_vec2 = (SFVec3fNative *)JS_GetPrivate(_ob2)) == NULL) {
printf( "JS_GetPrivate failed for _ob1 in SFRotationConstr.\n");
return JS_FALSE;
}
@@ -2513,7 +2498,7 @@ SFRotationGetProperty(JSContext *cx, JSO
#endif
{
SFRotationNative *ptr;
- jsdouble d;
+ double d;
#if JS_VERSION >= 185
jsval id;
if (!JS_IdToValue(cx,iid,&id)) {
@@ -2526,7 +2511,7 @@ SFRotationGetProperty(JSContext *cx, JSO
printf ("start of SFRotationGetProperty\n");
#endif
- if ((ptr = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFRotationGetProperty.\n");
return JS_FALSE;
}
@@ -2595,7 +2580,7 @@ SFRotationSetProperty(JSContext *cx, JSO
printf ("start of SFRotationSetProperty\n");
#endif
- if ((ptr = (SFRotationNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFRotationNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFRotationSetProperty.\n");
return JS_FALSE;
}
@@ -2656,15 +2641,15 @@ SFRotationSetProperty(JSContext *cx, JSO
#define __2FLENGTH 6
#define __2FNORMALIZE 8
JSBool SFVec2fGeneric( JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval, int op) {
+ uint32_t argc, jsval *argv, jsval *rval, int op) {
JSObject *_paramObj, *_proto, *_retObj;
SFVec2fNative *_vec1 = NULL;
SFVec2fNative *_vec2 = NULL;
SFVec2fNative *_retNative = NULL;
- jsdouble d=0.0;
- jsdouble d0=0.0;
- jsdouble d1=0.0;
+ double d=0.0;
+ double d0=0.0;
+ double d1=0.0;
struct point_XYZ v1, v2;
@@ -2679,7 +2664,7 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
/* is the "argv" parameter a string? */
int param_isString;
char *charString;
- jsdouble pars[3];
+ double pars[3];
JSString *_str;
/* determine what kind of parameter to get */
@@ -2730,7 +2715,7 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
CHECK_CLASS(cx,_paramObj,argv,__FUNCTION__,SFVec2fClass)
- if ((_vec2 = (SFVec2fNative*)JS_GetPrivate(cx, _paramObj)) == NULL) {
+ if ((_vec2 = (SFVec2fNative*)JS_GetPrivate(_paramObj)) == NULL) {
printf( "JS_GetPrivate failed for _paramObj in SFVec2f.\n");
return JS_FALSE;
}
@@ -2741,7 +2726,7 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
}
/* get our values */
- if ((_vec1 = (SFVec2fNative*)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_vec1 = (SFVec2fNative*)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec2fAdd.\n");
return JS_FALSE;
}
@@ -2785,17 +2770,17 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
/* set the return object */
if (retSFVec2f) {
- if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ if ((_proto = JS_GetPrototype(obj)) == NULL) {
printf( "JS_GetPrototype failed in SFVec2f.\n");
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec2fClass, _proto, NULL)) == NULL) {
+ JS_ConstructObject(cx, &SFVec2fClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFVec2f.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);
- if ((_retNative = (SFVec2fNative*)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFVec2fNative*)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFVec2f.\n");
return JS_FALSE;
}
@@ -2825,10 +2810,10 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
JSBool
#if JS_VERSION < 185
-SFVec2fAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fAdd(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FADD);
#else
-SFVec2fAdd(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fAdd(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2840,10 +2825,10 @@ SFVec2fAdd(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
-SFVec2fDivide(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fDivide(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FDIVIDE);
#else
-SFVec2fDivide(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fDivide(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2855,10 +2840,10 @@ SFVec2fDivide(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec2fMultiply(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fMultiply(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FMULT);
#else
-SFVec2fMultiply(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fMultiply(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2870,10 +2855,10 @@ SFVec2fMultiply(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec2fSubtract(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fSubtract(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FSUBT);
#else
-SFVec2fSubtract(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fSubtract(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2885,10 +2870,10 @@ SFVec2fSubtract(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec2fDot(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fDot(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FDOT);
#else
-SFVec2fDot(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fDot(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2900,10 +2885,10 @@ SFVec2fDot(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
-SFVec2fLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fLength(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FLENGTH);
#else
-SFVec2fLength(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fLength(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2915,10 +2900,10 @@ SFVec2fLength(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec2fNormalize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fNormalize(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
return SFVec2fGeneric(cx, obj, argc, argv, rval, __2FNORMALIZE);
#else
-SFVec2fNormalize(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fNormalize(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -2930,9 +2915,9 @@ SFVec2fNormalize(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
-SFVec2fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec2fToString(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -2942,7 +2927,7 @@ SFVec2fToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFVec2fNative*)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec2fNative*)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec2fToString.\n");
return JS_FALSE;
}
@@ -2962,9 +2947,9 @@ SFVec2fToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec2fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec2fAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -2973,7 +2958,7 @@ SFVec2fAssign(JSContext *cx, uintN argc,
SFVec2fNative *fptr, *ptr;
char *_id_str;
- if ((ptr = (SFVec2fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec2fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec2fAssign.\n");
return JS_FALSE;
}
@@ -2993,7 +2978,7 @@ SFVec2fAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFVec2fClass)
- if ((fptr = (SFVec2fNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFVec2fNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFVec2fAssign.\n");
return JS_FALSE;
}
@@ -3014,14 +2999,14 @@ SFVec2fAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec2fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec2fConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec2fConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFVec2fConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFVec2fClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFVec2fNative *ptr;
- jsdouble pars[2];
+ double pars[2];
ADD_ROOT(cx,obj)
@@ -3034,10 +3019,7 @@ SFVec2fConstr(JSContext *cx, uintN argc,
printf( "JS_DefineProperties failed in SFVec2fConstr.\n");
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFVec2fConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -3075,7 +3057,7 @@ SFVec2fGetProperty(JSContext *cx, JSObje
#endif
{
SFVec2fNative *ptr;
- jsdouble d;
+ double d;
#if JS_VERSION >= 185
jsval id;
if (!JS_IdToValue(cx,iid,&id)) {
@@ -3084,7 +3066,7 @@ SFVec2fGetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec2fNative *)JS_GetPrivate(cx,obj)) == NULL) {
+ if ((ptr = (SFVec2fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec2fGetProperty.\n");
return JS_FALSE;
}
@@ -3131,7 +3113,7 @@ SFVec2fSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec2fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec2fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec2fSetProperty.\n");
return JS_FALSE;
}
@@ -3189,13 +3171,13 @@ SFVec2fSetProperty(JSContext *cx, JSObje
#define __3FCROSS 9
JSBool SFVec3fGeneric( JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval, int op) {
+ uint32_t argc, jsval *argv, jsval *rval, int op) {
JSObject *_paramObj, *_proto, *_retObj;
SFVec3fNative *_vec1, *_vec2, *_retNative;
- jsdouble d=0.0;
- jsdouble d0=0.0;
- jsdouble d1=0.0;
- jsdouble d2=0.0;
+ double d=0.0;
+ double d0=0.0;
+ double d1=0.0;
+ double d2=0.0;
struct point_XYZ v1, v2, ret;
@@ -3210,7 +3192,7 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
/* is the "argv" parameter a string? */
int param_isString;
char *charString;
- jsdouble pars[3];
+ double pars[3];
JSString *_str;
#ifdef JSVRMLCLASSESVERBOSE
@@ -3266,7 +3248,7 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
CHECK_CLASS(cx,_paramObj,argv,__FUNCTION__,SFVec3fClass)
/* get the second object's data */
- if ((_vec2 = (SFVec3fNative*)JS_GetPrivate(cx, _paramObj)) == NULL) {
+ if ((_vec2 = (SFVec3fNative*)JS_GetPrivate(_paramObj)) == NULL) {
printf( "JS_GetPrivate failed for _paramObj in SFVec3f.\n");
return JS_FALSE;
}
@@ -3278,7 +3260,7 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
}
/* get our values */
- if ((_vec1 = (SFVec3fNative*)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_vec1 = (SFVec3fNative*)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec3fAdd.\n");
return JS_FALSE;
}
@@ -3349,17 +3331,17 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
#ifdef JSVRMLCLASSESVERBOSE
printf ("returning SFVec3f\n");
#endif
- if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ if ((_proto = JS_GetPrototype(obj)) == NULL) {
printf( "JS_GetPrototype failed in SFVec3f.\n");
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec3fClass, _proto, NULL)) == NULL) {
+ JS_ConstructObject(cx, &SFVec3fClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFVec3f.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);
- if ((_retNative = (SFVec3fNative*)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFVec3fNative*)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFVec3f.\n");
return JS_FALSE;
}
@@ -3390,10 +3372,10 @@ return JS_TRUE;
JSBool
#if JS_VERSION < 185
SFVec3fAdd(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FADD);
#else
-SFVec3fAdd(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fAdd(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3406,10 +3388,10 @@ SFVec3fAdd(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
SFVec3fCross(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FCROSS);
#else
-SFVec3fCross(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fCross(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3422,10 +3404,10 @@ SFVec3fCross(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3fDivide(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FDIVIDE);
#else
-SFVec3fDivide(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fDivide(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3438,10 +3420,10 @@ SFVec3fDivide(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3fDot(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FDOT);
#else
-SFVec3fDot(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fDot(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3454,10 +3436,10 @@ SFVec3fDot(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
SFVec3fLength(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FLENGTH);
#else
-SFVec3fLength(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fLength(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3471,10 +3453,10 @@ SFVec3fLength(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3fMultiply(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FMULT);
#else
-SFVec3fMultiply(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fMultiply(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3488,10 +3470,10 @@ SFVec3fMultiply(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
SFVec3fNegate(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FNEGATE);
#else
-SFVec3fNegate(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fNegate(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3504,10 +3486,10 @@ SFVec3fNegate(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3fNormalize(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FNORMALIZE);
#else
-SFVec3fNormalize(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fNormalize(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3520,10 +3502,10 @@ SFVec3fNormalize(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
SFVec3fSubtract(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3fGeneric(cx, obj, argc, argv, rval, __3FSUBT);
#else
-SFVec3fSubtract(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fSubtract(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -3535,9 +3517,9 @@ SFVec3fSubtract(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec3fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3fToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3fToString(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -3547,7 +3529,7 @@ SFVec3fToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFVec3fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3fToString.\n");
return JS_FALSE;
}
@@ -3573,9 +3555,9 @@ SFVec3fToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec3fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3fAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3fAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -3588,7 +3570,7 @@ SFVec3fAssign(JSContext *cx, uintN argc,
printf ("start of SFVec3fAssign\n");
#endif
- if ((ptr = (SFVec3fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec3fAssign.\n");
return JS_FALSE;
}
@@ -3608,7 +3590,7 @@ SFVec3fAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFVec3fClass)
- if ((fptr = (SFVec3fNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFVec3fNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFVec3fAssign.\n");
return JS_FALSE;
}
@@ -3633,14 +3615,14 @@ SFVec3fAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec3fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3fConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3fConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3fConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFVec3fClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFVec3fNative *ptr;
- jsdouble pars[3];
+ double pars[3];
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of SFVec3fConstr\n");
@@ -3657,10 +3639,7 @@ SFVec3fConstr(JSContext *cx, uintN argc,
printf( "JS_DefineProperties failed in SFVec3fConstr.\n");
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFVec3fConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -3700,7 +3679,7 @@ SFVec3fGetProperty(JSContext *cx, JSObje
#endif
{
SFVec3fNative *ptr;
- jsdouble d;
+ double d;
#ifdef JSVRMLCLASSESVERBOSE
JSString *_idStr;
char *_id_c;
@@ -3729,7 +3708,7 @@ SFVec3fGetProperty(JSContext *cx, JSObje
#endif
#endif
- if ((ptr = (SFVec3fNative *)JS_GetPrivate(cx,obj)) == NULL) {
+ if ((ptr = (SFVec3fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3fGetProperty.\n");
return JS_FALSE;
}
@@ -3790,7 +3769,7 @@ SFVec3fSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec3fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3fSetProperty.\n");
return JS_FALSE;
}
@@ -3848,13 +3827,13 @@ SFVec3fSetProperty(JSContext *cx, JSObje
*/
JSBool SFVec3dGeneric( JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval, int op) {
+ uint32_t argc, jsval *argv, jsval *rval, int op) {
JSObject *_paramObj, *_proto, *_retObj;
SFVec3dNative *_vec1, *_vec2, *_retNative;
- jsdouble d=0.0;
- jsdouble d0=0.0;
- jsdouble d1=0.0;
- jsdouble d2=0.0;
+ double d=0.0;
+ double d0=0.0;
+ double d1=0.0;
+ double d2=0.0;
struct point_XYZ v1, v2, ret;
@@ -3869,7 +3848,7 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
/* is the "argv" parameter a string? */
int param_isString;
char *charString;
- jsdouble pars[3];
+ double pars[3];
JSString *_str;
/* determine what kind of parameter to get */
@@ -3921,7 +3900,7 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
CHECK_CLASS(cx,_paramObj,argv,__FUNCTION__,SFVec3dClass)
/* get the second object's data */
- if ((_vec2 = (SFVec3dNative*)JS_GetPrivate(cx, _paramObj)) == NULL) {
+ if ((_vec2 = (SFVec3dNative*)JS_GetPrivate(_paramObj)) == NULL) {
printf( "JS_GetPrivate failed for _paramObj in SFVec3d.\n");
return JS_FALSE;
}
@@ -3933,7 +3912,7 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
}
/* get our values */
- if ((_vec1 = (SFVec3dNative*)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((_vec1 = (SFVec3dNative*)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec3dAdd.\n");
return JS_FALSE;
}
@@ -4004,17 +3983,17 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
#ifdef JSVRMLCLASSESVERBOSE
printf ("returning SFVec3d\n");
#endif
- if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ if ((_proto = JS_GetPrototype(obj)) == NULL) {
printf( "JS_GetPrototype failed in SFVec3d.\n");
return JS_FALSE;
}
if ((_retObj =
- JS_ConstructObject(cx, &SFVec3dClass, _proto, NULL)) == NULL) {
+ JS_ConstructObject(cx, &SFVec3dClass, _proto)) == NULL) {
printf( "JS_ConstructObject failed in SFVec3d.\n");
return JS_FALSE;
}
*rval = OBJECT_TO_JSVAL(_retObj);
- if ((_retNative = (SFVec3dNative*)JS_GetPrivate(cx, _retObj)) == NULL) {
+ if ((_retNative = (SFVec3dNative*)JS_GetPrivate(_retObj)) == NULL) {
printf( "JS_GetPrivate failed for _retObj in SFVec3d.\n");
return JS_FALSE;
}
@@ -4045,10 +4024,10 @@ return JS_TRUE;
JSBool
#if JS_VERSION < 185
SFVec3dAdd(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FADD);
#else
-SFVec3dAdd(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dAdd(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4061,10 +4040,10 @@ SFVec3dAdd(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
SFVec3dCross(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FCROSS);
#else
-SFVec3dCross(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dCross(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4077,10 +4056,10 @@ SFVec3dCross(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3dDivide(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FDIVIDE);
#else
-SFVec3dDivide(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dDivide(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4093,10 +4072,10 @@ SFVec3dDivide(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3dDot(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FDOT);
#else
-SFVec3dDot(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dDot(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4109,10 +4088,10 @@ SFVec3dDot(JSContext *cx, uintN argc, js
JSBool
#if JS_VERSION < 185
SFVec3dLength(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FLENGTH);
#else
-SFVec3dLength(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dLength(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4126,10 +4105,10 @@ SFVec3dLength(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3dMultiply(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FMULT);
#else
-SFVec3dMultiply(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dMultiply(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4143,10 +4122,10 @@ SFVec3dMultiply(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
SFVec3dNegate(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FNEGATE);
#else
-SFVec3dNegate(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dNegate(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4159,10 +4138,10 @@ SFVec3dNegate(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
SFVec3dNormalize(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FNORMALIZE);
#else
-SFVec3dNormalize(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dNormalize(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4175,10 +4154,10 @@ SFVec3dNormalize(JSContext *cx, uintN ar
JSBool
#if JS_VERSION < 185
SFVec3dSubtract(JSContext *cx, JSObject *obj,
- uintN argc, jsval *argv, jsval *rval) {
+ uint32_t argc, jsval *argv, jsval *rval) {
return SFVec3dGeneric(cx, obj, argc, argv, rval, __3FSUBT);
#else
-SFVec3dSubtract(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dSubtract(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
jsval rval;
@@ -4190,9 +4169,9 @@ SFVec3dSubtract(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec3dToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3dToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3dToString(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -4202,7 +4181,7 @@ SFVec3dToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFVec3dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3dToString.\n");
return JS_FALSE;
}
@@ -4226,9 +4205,9 @@ SFVec3dToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec3dAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3dAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3dAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -4241,7 +4220,7 @@ SFVec3dAssign(JSContext *cx, uintN argc,
printf ("start of SFVec3dAssign\n");
#endif
- if ((ptr = (SFVec3dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec3dAssign.\n");
return JS_FALSE;
}
@@ -4261,7 +4240,7 @@ SFVec3dAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFVec3dClass)
- if ((fptr = (SFVec3dNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFVec3dNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFVec3dAssign.\n");
return JS_FALSE;
}
@@ -4286,14 +4265,14 @@ SFVec3dAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec3dConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec3dConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec3dConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFVec3dConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFVec3dClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFVec3dNative *ptr;
- jsdouble pars[3];
+ double pars[3];
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of SFVec3dConstr\n");
@@ -4310,10 +4289,7 @@ SFVec3dConstr(JSContext *cx, uintN argc,
printf( "JS_DefineProperties failed in SFVec3dConstr.\n");
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFVec3dConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -4353,7 +4329,7 @@ SFVec3dGetProperty(JSContext *cx, JSObje
#endif
{
SFVec3dNative *ptr;
- jsdouble d;
+ double d;
#ifdef JSVRMLCLASSESVERBOSE
JSString *_idStr;
char *_id_c;
@@ -4380,7 +4356,7 @@ SFVec3dGetProperty(JSContext *cx, JSObje
#endif
#endif
- if ((ptr = (SFVec3dNative *)JS_GetPrivate(cx,obj)) == NULL) {
+ if ((ptr = (SFVec3dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3dGetProperty.\n");
return JS_FALSE;
}
@@ -4441,7 +4417,7 @@ SFVec3dSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec3dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec3dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec3dSetProperty.\n");
return JS_FALSE;
}
@@ -4487,9 +4463,9 @@ SFVec3dSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-SFVec4fToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4fToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4fToString(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4fToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -4499,7 +4475,7 @@ SFVec4fToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFVec4fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4fToString.\n");
return JS_FALSE;
}
@@ -4523,9 +4499,9 @@ SFVec4fToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec4fAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4fAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4fAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4fAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -4538,7 +4514,7 @@ SFVec4fAssign(JSContext *cx, uintN argc,
printf ("start of SFVec4fAssign\n");
#endif
- if ((ptr = (SFVec4fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec4fAssign.\n");
return JS_FALSE;
}
@@ -4558,7 +4534,7 @@ SFVec4fAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFVec4fClass)
- if ((fptr = (SFVec4fNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFVec4fNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFVec4fAssign.\n");
return JS_FALSE;
}
@@ -4583,14 +4559,14 @@ SFVec4fAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec4fConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4fConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4fConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4fConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFVec4fClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFVec4fNative *ptr;
- jsdouble pars[4];
+ double pars[4];
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of SFVec4fConstr\n");
@@ -4607,10 +4583,7 @@ SFVec4fConstr(JSContext *cx, uintN argc,
printf( "JS_DefineProperties failed in SFVec4fConstr.\n");
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFVec4fConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -4652,7 +4625,7 @@ SFVec4fGetProperty(JSContext *cx, JSObje
#endif
{
SFVec4fNative *ptr;
- jsdouble d;
+ double d;
#ifdef JSVRMLCLASSESVERBOSE
JSString *_idStr;
char *_id_c;
@@ -4681,7 +4654,7 @@ SFVec4fGetProperty(JSContext *cx, JSObje
#endif
#endif
- if ((ptr = (SFVec4fNative *)JS_GetPrivate(cx,obj)) == NULL) {
+ if ((ptr = (SFVec4fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4fGetProperty.\n");
return JS_FALSE;
}
@@ -4751,7 +4724,7 @@ SFVec4fSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec4fNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4fNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4fSetProperty.\n");
return JS_FALSE;
}
@@ -4805,9 +4778,9 @@ SFVec4fSetProperty(JSContext *cx, JSObje
JSBool
#if JS_VERSION < 185
-SFVec4dToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4dToString(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4dToString(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4dToString(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
#endif
@@ -4817,7 +4790,7 @@ SFVec4dToString(JSContext *cx, uintN arg
UNUSED(argc);
UNUSED(argv);
- if ((ptr = (SFVec4dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4dToString.\n");
return JS_FALSE;
}
@@ -4842,9 +4815,9 @@ SFVec4dToString(JSContext *cx, uintN arg
JSBool
#if JS_VERSION < 185
-SFVec4dAssign(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4dAssign(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4dAssign(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4dAssign(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_THIS_OBJECT(cx,vp);
jsval *argv = JS_ARGV(cx,vp);
JSString *_id_jsstr;
@@ -4857,7 +4830,7 @@ SFVec4dAssign(JSContext *cx, uintN argc,
printf ("start of SFVec4dAssign\n");
#endif
- if ((ptr = (SFVec4dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed for obj in SFVec4dAssign.\n");
return JS_FALSE;
}
@@ -4877,7 +4850,7 @@ SFVec4dAssign(JSContext *cx, uintN argc,
CHECK_CLASS(cx,_from_obj,argv,__FUNCTION__,SFVec4dClass)
- if ((fptr = (SFVec4dNative *)JS_GetPrivate(cx, _from_obj)) == NULL) {
+ if ((fptr = (SFVec4dNative *)JS_GetPrivate(_from_obj)) == NULL) {
printf( "JS_GetPrivate failed for _from_obj in SFVec4dAssign.\n");
return JS_FALSE;
}
@@ -4902,14 +4875,14 @@ SFVec4dAssign(JSContext *cx, uintN argc,
JSBool
#if JS_VERSION < 185
-SFVec4dConstr(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) {
+SFVec4dConstr(JSContext *cx, JSObject *obj, uint32_t argc, jsval *argv, jsval *rval) {
#else
-SFVec4dConstr(JSContext *cx, uintN argc, jsval *vp) {
+SFVec4dConstr(JSContext *cx, uint32_t argc, jsval *vp) {
JSObject *obj = JS_NewObject(cx,&SFVec4dClass,NULL,NULL);
jsval *argv = JS_ARGV(cx,vp);
#endif
SFVec4dNative *ptr;
- jsdouble pars[4];
+ double pars[4];
#ifdef JSVRMLCLASSESVERBOSE
printf ("start of SFVec4dConstr\n");
@@ -4926,10 +4899,7 @@ SFVec4dConstr(JSContext *cx, uintN argc,
printf( "JS_DefineProperties failed in SFVec4dConstr.\n");
return JS_FALSE;
}
- if (!JS_SetPrivate(cx, obj, ptr)) {
- printf( "JS_SetPrivate failed in SFVec4dConstr.\n");
- return JS_FALSE;
- }
+ JS_SetPrivate(obj, ptr);
if (argc == 0) {
(ptr->v).c[0] = (float) 0.0;
@@ -4971,7 +4941,7 @@ SFVec4dGetProperty(JSContext *cx, JSObje
#endif
{
SFVec4dNative *ptr;
- jsdouble d;
+ double d;
#ifdef JSVRMLCLASSESVERBOSE
JSString *_idStr;
char *_id_c;
@@ -4996,7 +4966,7 @@ SFVec4dGetProperty(JSContext *cx, JSObje
#endif
#endif
- if ((ptr = (SFVec4dNative *)JS_GetPrivate(cx,obj)) == NULL) {
+ if ((ptr = (SFVec4dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4dGetProperty.\n");
return JS_FALSE;
}
@@ -5066,7 +5036,7 @@ SFVec4dSetProperty(JSContext *cx, JSObje
}
#endif
- if ((ptr = (SFVec4dNative *)JS_GetPrivate(cx, obj)) == NULL) {
+ if ((ptr = (SFVec4dNative *)JS_GetPrivate(obj)) == NULL) {
printf( "JS_GetPrivate failed in SFVec4dSetProperty.\n");
return JS_FALSE;
}