Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-01 12:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #192718. mozilla-xremote-client links against xpcom when it doesn't need to (round 2.) r/a=dbaron

Browse Source
This commit is contained in:
blizzard%redhat.com 2003-02-14 13:17:50 +00:00
parent 8c729040fe
commit 8f66288f79
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widget/src/xremoteclient/Makefile.in
View File

@ -50,11 +50,11 @@ EXPORTS = \
PROGRAM = mozilla-xremote-client$(BIN_SUFFIX)
PROGOBJS = mozilla-xremote-client.$(OBJ_SUFFIX) \
XRemoteClient.$(OBJ_SUFFIX) \
XRemoteClient_standalone.$(OBJ_SUFFIX) \
$(NULL)
LIBS = \
$(XPCOM_LIBS) $(NSPR_LIBS) \
$(NSPR_LIBS) \
$(XLDFLAGS) $(XLIBS)
include $(topsrcdir)/config/rules.mk
@ -66,3 +66,6 @@ endif
ifeq ($(OS_ARCH), OpenVMS)
DEFINES += -DGENERIC_MOTIF_REDEFINES
endif
XRemoteClient_standalone.$(OBJ_SUFFIX): XRemoteClient.cpp
$(CXX) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) -DXREMOTE_STANDALONE $<

3
widget/src/xremoteclient/XRemoteClient.cpp
View File

@ -69,7 +69,9 @@ XRemoteClient::~XRemoteClient()
Shutdown();
}
#ifndef XREMOTE_STANDALONE
NS_IMPL_ISUPPORTS1(XRemoteClient, nsIXRemoteClient);
#endif
NS_IMETHODIMP
XRemoteClient::Init (void)
@ -325,7 +327,6 @@ XRemoteClient::GetLock(Window aWindow, PRBool *aDestroyed)
status = PR_GetSystemInfo(PR_SI_HOSTNAME, sysinfobuf,
SYS_INFO_BUFFER_LENGTH);
if (status != PR_SUCCESS) {
NS_WARNING("failed to get hostname");
return NS_ERROR_FAILURE;
}

8
widget/src/xremoteclient/XRemoteClient.h
View File

@ -20,16 +20,22 @@
#include <X11/X.h>
#include <X11/Xlib.h>
#include "nsIXRemoteClient.h"
class XRemoteClient : public nsIXRemoteClient
class XRemoteClient
#ifndef XREMOTE_STANDALONE
: public nsIXRemoteClient
#endif
{
public:
XRemoteClient();
virtual ~XRemoteClient();
#ifndef XREMOTE_STANDALONE
// nsISupports
NS_DECL_ISUPPORTS
#endif
// nsIXRemoteClient
NS_DECL_NSIXREMOTECLIENT