Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final fix. This is the way this patch should have landed. including nsXPIDLCString when XPCOM_GLUE is defined is not a good idea

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@132217 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com 2002-10-18 03:46:04 +00:00
parent 515648f5b0
commit 3c121c69da
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/xpcom/sample/Makefile.in
View File

@ -63,15 +63,11 @@ EXTRA_COMPONENTS = nsSample.js
# seperate libraries linked in.
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NSPR_LIBS) \
$(NULL)
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
$(NSPR_LIBS) \
$(NULL)

3
mozilla/xpcom/sample/nsTestSample.cpp
View File

@ -46,12 +46,13 @@
#include "nsISample.h"
#include "nsIServiceManager.h"
#include "nsXPIDLString.h"
#include "nsIComponentRegistrar.h"
#ifdef XPCOM_GLUE
#include "nsXPCOMGlue.h"
#include "nsMemory.h"
#else
#include "nsXPIDLString.h"
#endif
#define NS_SAMPLE_CONTRACTID "@mozilla.org/sample;1"