Commit ba4f36c0 authored by mccabe%netscape.com's avatar mccabe%netscape.com
Browse files

Backed out my previous checkin.

I realized that:
- we build on more than one build system.
- I'm too tired to fix it.
parent ceb11bcb
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ LIBS = \
	-lxptcall \
	-lxptcmd \
	-lreg       \
	-lraptorbase \
	-l$(MOZ_LIB_UTIL_PREFIX)util    \
	$(NSPR_LIBS) 	\
	$(NULL)
+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ LIBS = \
	-lxptcmd \
	-lxptinfo \
	-lreg       \
	-lraptorbase \
	-l$(MOZ_LIB_UTIL_PREFIX)util    \
	$(NSPR_LIBS) 	\
	$(NULL)
+0 −15
Original line number Diff line number Diff line
@@ -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;
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ LIBS = \
		  -lxpt 	\
		  -lxpcom	\
		  -lreg		\
		  -lraptorbase  \
		  $(NSPR_LIBS) 	\
		  $(NULL)

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ LIBS = \
	-lxptcmd \
	-lxptinfo \
	-lreg       \
	-lraptorbase \
	-l$(MOZ_LIB_UTIL_PREFIX)util    \
	$(NSPR_LIBS) 	\
	$(NULL)
Loading