зеркало из https://github.com/mozilla/pjs.git
bug 66759 - finally remove XPCOM_STANDALONE completely
r=dougt, rs=brendan, a=asa
This commit is contained in:
Родитель
1e67ffa724
Коммит
7a408d91af
|
@ -285,10 +285,6 @@ NECKO=1
|
|||
CFLAGS=$(CFLAGS) -DNECKO
|
||||
|
||||
|
||||
!if defined(XPCOM_STANDALONE)
|
||||
CFLAGS=$(CFLAGS) -DXPCOM_STANDALONE
|
||||
!endif
|
||||
|
||||
!if defined(XPCONNECT_STANDALONE)
|
||||
CFLAGS=$(CFLAGS) -DXPCONNECT_STANDALONE
|
||||
!endif
|
||||
|
|
|
@ -36,8 +36,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef XPCOM_STANDALONE
|
||||
|
||||
#include "nsXPCOM.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsIPersistentProperties2.h"
|
||||
|
@ -62,11 +60,9 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
|
|||
|
||||
/***************************************************************************/
|
||||
|
||||
#endif
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
#ifndef XPCOM_STANDALONE
|
||||
nsresult ret;
|
||||
|
||||
|
||||
|
@ -180,6 +176,5 @@ main(int argc, char* argv[])
|
|||
delete[] pVal;
|
||||
ret = propEnum->Next();
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -58,10 +58,6 @@ CPPSRCS = \
|
|||
nsNativeCharsetUtils.cpp \
|
||||
$(NULL)
|
||||
|
||||
#ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
#CPPSRCS += nsLocalFileUnicode.cpp
|
||||
#endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
|
||||
CPPSRCS += nsLocalFileOS2.cpp
|
||||
#else
|
||||
|
|
Загрузка…
Ссылка в новой задаче