Backed out my previous checkin.
I realized that: - we build on more than one build system. - I'm too tired to fix it. git-svn-id: svn://10.0.0.236/trunk@28827 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -46,7 +46,6 @@ LIBS = \
|
||||
-lxptcall \
|
||||
-lxptcmd \
|
||||
-lreg \
|
||||
-lraptorbase \
|
||||
-l$(MOZ_LIB_UTIL_PREFIX)util \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@@ -41,7 +41,6 @@ LIBS = \
|
||||
-lxptcmd \
|
||||
-lxptinfo \
|
||||
-lreg \
|
||||
-lraptorbase \
|
||||
-l$(MOZ_LIB_UTIL_PREFIX)util \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
#endif
|
||||
#include "nscore.h"
|
||||
|
||||
#include "nsSpecialSystemDirectory.h"
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsIInterfaceInfoManager.h"
|
||||
#include "nsIInterfaceInfo.h"
|
||||
@@ -309,21 +307,8 @@ nsInterfaceInfoManager::initInterfaceTables()
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// this code stolen from SetupRegistry; it might bear further
|
||||
// examination, as the code there doesn't look quite done.
|
||||
nsSpecialSystemDirectory
|
||||
sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
|
||||
sysdir += "components";
|
||||
const char *xptdirname = sysdir.GetCString(); // native path
|
||||
if (xptdirname != NULL) {
|
||||
fprintf(stderr, "nsInterfaceInfoManager: Using xpt dir: %s\n", xptdirname);
|
||||
}
|
||||
|
||||
#if 0
|
||||
// First, find the xpt directory from the env. XXX Temporary hack.
|
||||
char *xptdirname = PR_GetEnv("XPTDIR");
|
||||
#endif
|
||||
|
||||
PRDir *xptdir;
|
||||
if (xptdirname == NULL || (xptdir = PR_OpenDir(xptdirname)) == NULL)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
@@ -37,7 +37,6 @@ LIBS = \
|
||||
-lxpt \
|
||||
-lxpcom \
|
||||
-lreg \
|
||||
-lraptorbase \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@ LIBS = \
|
||||
-lxptcmd \
|
||||
-lxptinfo \
|
||||
-lreg \
|
||||
-lraptorbase \
|
||||
-l$(MOZ_LIB_UTIL_PREFIX)util \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
#endif
|
||||
#include "nscore.h"
|
||||
|
||||
#include "nsSpecialSystemDirectory.h"
|
||||
|
||||
#include "nsISupports.h"
|
||||
#include "nsIInterfaceInfoManager.h"
|
||||
#include "nsIInterfaceInfo.h"
|
||||
@@ -309,21 +307,8 @@ nsInterfaceInfoManager::initInterfaceTables()
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// this code stolen from SetupRegistry; it might bear further
|
||||
// examination, as the code there doesn't look quite done.
|
||||
nsSpecialSystemDirectory
|
||||
sysdir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
|
||||
sysdir += "components";
|
||||
const char *xptdirname = sysdir.GetCString(); // native path
|
||||
if (xptdirname != NULL) {
|
||||
fprintf(stderr, "nsInterfaceInfoManager: Using xpt dir: %s\n", xptdirname);
|
||||
}
|
||||
|
||||
#if 0
|
||||
// First, find the xpt directory from the env. XXX Temporary hack.
|
||||
char *xptdirname = PR_GetEnv("XPTDIR");
|
||||
#endif
|
||||
|
||||
PRDir *xptdir;
|
||||
if (xptdirname == NULL || (xptdir = PR_OpenDir(xptdirname)) == NULL)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
@@ -37,7 +37,6 @@ LIBS = \
|
||||
-lxpt \
|
||||
-lxpcom \
|
||||
-lreg \
|
||||
-lraptorbase \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user