Commit fa8028e6 authored by deuce's avatar deuce
Browse files

Fix jsdoor build

parent 8363e678
......@@ -204,9 +204,9 @@ $(MAKEUSER): $(MAKEUSER_OBJS)
$(QUIET)$(CC) $(CONSOLE_LDFLAGS) -o $@ $(MAKEUSER_OBJS) $(XPDEV_LIBS) $(SMBLIB_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# JSDOOR
$(JSDOOR): $(JSDOOR_OBJS) $(SBBS)
$(JSDOOR): $(JSDOOR_OBJS) $(SBBS) $(ENCODE_LIB) $(HASH_LIB)
@echo Linking $@
$(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSDOOR_OBJS) $(JS_LIBS) $(CRYPT_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS)
$(QUIET)$(CXX) $(LDFLAGS) $(MT_LDFLAGS) -o $@ $(JSDOOR_OBJS) $(JS_LIBS) $(CRYPT_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(SMBLIB_LIBS) $(XPDEV-MT_LIBS) $(ENCODE_LIBS) $(HASH_LIBS)
# JSEXEC
$(JSEXEC): $(JSEXEC_OBJS) $(SBBS)
......
......@@ -552,6 +552,8 @@ enum {
,SYSSTAT_PROP_FEEDBACK
};
extern JSClass js_system_class;
#ifndef JSDOOR
static JSBool js_sysstats_get(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
{
......@@ -737,8 +739,6 @@ static JSClass js_sysstats_class = {
,JS_FinalizeStub /* finalize */
};
extern JSClass js_system_class;
static JSBool
js_alias(JSContext *cx, uintN argc, jsval *arglist)
{
......
......@@ -53,6 +53,20 @@
scfg_t scfg;
void* DLLCALL js_GetClassPrivate(JSContext *cx, JSObject *obj, JSClass* cls)
{
void *ret = JS_GetInstancePrivate(cx, obj, cls, NULL);
if(ret == NULL)
JS_ReportError(cx, "'%s' instance: No Private Data or Class Mismatch"
, cls == NULL ? "???" : cls->name);
return ret;
}
void call_socket_open_callback(BOOL open)
{
}
SOCKET open_socket(int domain, int type, const char* protocol)
{
SOCKET sock;
......
......@@ -255,6 +255,8 @@ JSDOOR_OBJS = \
$(MTOBJODIR)$(DIRSEP)js_client$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_com$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_cryptcon$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_cryptcert$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_cryptkeyset$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_global$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_rtpool$(OFILE) \
$(MTOBJODIR)$(DIRSEP)js_sprintf$(OFILE) \
......@@ -274,8 +276,7 @@ JSDOOR_OBJS = \
$(MTOBJODIR)$(DIRSEP)scfglib2$(OFILE)\
$(MTOBJODIR)$(DIRSEP)wordwrap$(OFILE)\
$(MTOBJODIR)$(DIRSEP)userdat$(OFILE)\
$(MTOBJODIR)$(DIRSEP)uucode$(OFILE)\
$(MTOBJODIR)$(DIRSEP)yenc$(OFILE)\
$(MTOBJODIR)$(DIRSEP)msgdate$(OFILE)\
SEXYZ_OBJS = \
$(MTOBJODIR)$(DIRSEP)sexyz$(OFILE) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment