Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 315090 - convert xpconnect utils/tests to use frozen linkage, r=shaver

Browse Source
This commit is contained in:
bsmedberg%covad.net 2005-12-12 15:08:16 +00:00
parent 6f245329e8
commit 718ca7a4a6
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/xpconnect/shell/Makefile.in
View File

@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpcshell
SIMPLE_PROGRAMS = xpcshell$(BIN_SUFFIX)
MOZILLA_INTERNAL_API = 1
REQUIRES = xpconnect \
xpcom \
@ -56,6 +55,7 @@ REQUIRES = xpconnect \
CPPSRCS = xpcshell.cpp
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \

2
js/src/xpconnect/shell/xpcshell.cpp
View File

@ -45,6 +45,8 @@
/* XPConnect JavaScript interactive shell. */
#include <stdio.h>
#include "nsServiceManagerUtils.h"
#include "nsComponentManagerUtils.h"
#include "nsIXPConnect.h"
#include "nsIXPCScriptable.h"
#include "nsIInterfaceInfo.h"

8
js/src/xpconnect/tests/Makefile.in
View File

@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
MODULE = TestXPC
SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX)
MOZILLA_INTERNAL_API = 1
REQUIRES = xpconnect \
xpcom \
@ -54,11 +53,16 @@ REQUIRES = xpconnect \
xpconnect_tests \
$(NULL)
DIRS = idl components
DIRS = idl
ifndef MOZ_ENABLE_LIBXUL
DIRS += components
endif
CPPSRCS = TestXPC.cpp
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(LIBS_DIR) \
$(MOZ_JS_LIBS) \
$(MOZ_COMPONENT_LIBS) \

7
js/src/xpconnect/tests/TestXPC.cpp
View File

@ -42,6 +42,8 @@
#include <stdio.h>
#include "nsComponentManagerUtils.h"
#include "nsServiceManagerUtils.h"
#include "nsIXPConnect.h"
#include "nsIScriptError.h"
#include "nsIServiceManager.h"
@ -52,8 +54,9 @@
#include "nsMemory.h"
#include "nsIXPCSecurityManager.h"
#include "nsICategoryManager.h"
#include "nsString.h"
#include "nsIVariant.h"
#include "nsStringAPI.h"
#include "nsEmbedString.h"
#include "jsapi.h"
@ -515,7 +518,7 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
goto out;
}
if(d_in != d_out)
if(!d_in.Equals(d_out))
{
printf(" JS to native for %%is returned the wrong value -- FAILED!\n");
goto out;