mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 05:45:37 +00:00
Backed out changeset 30adfe786ffa (bug 464362) in an attempt to fix red on tinderbox.
This commit is contained in:
parent
308fb35654
commit
a057edd940
@ -47,6 +47,11 @@ MODULE = libreg
|
|||||||
LIBRARY_NAME = mozreg_s
|
LIBRARY_NAME = mozreg_s
|
||||||
DIST_INSTALL = 1
|
DIST_INSTALL = 1
|
||||||
|
|
||||||
|
# MacOSX requires the MoreFiles module
|
||||||
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
|
REQUIRES = macmorefiles
|
||||||
|
endif
|
||||||
|
|
||||||
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
|
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
|
||||||
|
|
||||||
BIN_SRCS = VerReg.c reg.c vr_stubs.c
|
BIN_SRCS = VerReg.c reg.c vr_stubs.c
|
||||||
@ -65,6 +70,10 @@ USE_STATIC_LIBS = 1
|
|||||||
|
|
||||||
SDK_LIBRARY = $(LIBRARY)
|
SDK_LIBRARY = $(LIBRARY)
|
||||||
|
|
||||||
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||||
|
SHARED_LIBRARY_LIBS += $(DEPTH)/xpcom/MoreFiles/libmacmorefiles_s.a
|
||||||
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
|
|
||||||
DEFINES += -DUSE_BUFFERED_REGISTRY_IO
|
DEFINES += -DUSE_BUFFERED_REGISTRY_IO
|
||||||
|
@ -151,11 +151,16 @@ static int32 regStartCount = 0;
|
|||||||
char *globalRegName = NULL;
|
char *globalRegName = NULL;
|
||||||
static char *user_name = NULL;
|
static char *user_name = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
|
|
||||||
void nr_MacAliasFromPath(const char * fileName, void ** alias, int32 * length);
|
void nr_MacAliasFromPath(const char * fileName, void ** alias, int32 * length);
|
||||||
char * nr_PathFromMacAlias(const void * alias, uint32 aliasLength);
|
char * nr_PathFromMacAlias(const void * alias, uint32 aliasLength);
|
||||||
|
|
||||||
|
#include "MoreFilesX.h"
|
||||||
|
|
||||||
static void copyCStringToPascal(Str255 dest, const char *src)
|
static void copyCStringToPascal(Str255 dest, const char *src)
|
||||||
{
|
{
|
||||||
size_t copyLen = strlen(src);
|
size_t copyLen = strlen(src);
|
||||||
@ -181,9 +186,9 @@ static OSErr isFileInTrash(FSRef *fsRef, PRBool *inTrash)
|
|||||||
err = FSFindFolder(catalogInfo.volume, kTrashFolderType, false, &trashFSRef);
|
err = FSFindFolder(catalogInfo.volume, kTrashFolderType, false, &trashFSRef);
|
||||||
if (err == noErr)
|
if (err == noErr)
|
||||||
{
|
{
|
||||||
|
/* FSRefGetParentRef returns noErr and a zeroed FSRef when it reaches the top */
|
||||||
for (currFSRef = *fsRef;
|
for (currFSRef = *fsRef;
|
||||||
(FSGetCatalogInfo(&currFSRef, kFSCatInfoNodeID, NULL, NULL, NULL, &parentFSRef) == noErr &&
|
(FSGetParentRef(&currFSRef, &parentFSRef) == noErr && FSRefValid(&parentFSRef));
|
||||||
FSGetCatalogInfo(&parentFSRef, kFSCatInfoNone, NULL, NULL, NULL, NULL) == noErr);
|
|
||||||
currFSRef = parentFSRef)
|
currFSRef = parentFSRef)
|
||||||
{
|
{
|
||||||
if (FSCompareFSRefs(&parentFSRef, &trashFSRef) == noErr)
|
if (FSCompareFSRefs(&parentFSRef, &trashFSRef) == noErr)
|
||||||
|
@ -47,6 +47,11 @@ include $(srcdir)/../src/objs.mk
|
|||||||
MODULE = libreg
|
MODULE = libreg
|
||||||
LIBRARY_NAME = mozregsa_s
|
LIBRARY_NAME = mozregsa_s
|
||||||
|
|
||||||
|
# MacOSX requires the MoreFiles module
|
||||||
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
|
REQUIRES = macmorefiles
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
USE_STATIC_LIBS = 1
|
USE_STATIC_LIBS = 1
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user