wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

remove morefilesx dependency in libreg. b=464362 r=smichaud sr=roc a=beltzner

Browse Source
This commit is contained in:
Josh Aas 2008-11-28 17:34:32 -05:00
parent 70531db076
commit bbc161055d
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/libreg/src/Makefile.in
View File

@ -47,11 +47,6 @@ MODULE = libreg
LIBRARY_NAME = mozreg_s
DIST_INSTALL = 1
# MacOSX requires the MoreFiles module
ifeq ($(OS_ARCH),Darwin)
REQUIRES = macmorefiles
endif
CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) nr_bufio.c
BIN_SRCS = VerReg.c reg.c vr_stubs.c
@ -70,10 +65,6 @@ USE_STATIC_LIBS = 1
SDK_LIBRARY = $(LIBRARY)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
SHARED_LIBRARY_LIBS += $(DEPTH)/xpcom/MoreFiles/libmacmorefiles_s.a
endif
include $(topsrcdir)/config/config.mk
DEFINES += -DUSE_BUFFERED_REGISTRY_IO

9
modules/libreg/src/reg.c
View File

@ -151,16 +151,11 @@ static int32 regStartCount = 0;
char *globalRegName = NULL;
static char *user_name = NULL;
#ifdef XP_MACOSX
void nr_MacAliasFromPath(const char * fileName, void ** alias, int32 * length);
char * nr_PathFromMacAlias(const void * alias, uint32 aliasLength);
#include "MoreFilesX.h"
static void copyCStringToPascal(Str255 dest, const char *src)
{
size_t copyLen = strlen(src);
@ -186,9 +181,9 @@ static OSErr isFileInTrash(FSRef *fsRef, PRBool *inTrash)
err = FSFindFolder(catalogInfo.volume, kTrashFolderType, false, &trashFSRef);
if (err == noErr)
{
/* FSRefGetParentRef returns noErr and a zeroed FSRef when it reaches the top */
for (currFSRef = *fsRef;
(FSGetParentRef(&currFSRef, &parentFSRef) == noErr && FSRefValid(&parentFSRef));
(FSGetCatalogInfo(&currFSRef, kFSCatInfoNodeID, NULL, NULL, NULL, &parentFSRef) == noErr &&
FSGetCatalogInfo(&parentFSRef, kFSCatInfoNone, NULL, NULL, NULL, NULL) == noErr);
currFSRef = parentFSRef)
{
if (FSCompareFSRefs(&parentFSRef, &trashFSRef) == noErr)

5
modules/libreg/standalone/Makefile.in
View File

@ -47,11 +47,6 @@ include $(srcdir)/../src/objs.mk
MODULE = libreg
LIBRARY_NAME = mozregsa_s
# MacOSX requires the MoreFiles module
ifeq ($(OS_ARCH),Darwin)
REQUIRES = macmorefiles
endif
ifeq ($(OS_ARCH),WINNT)
USE_STATIC_LIBS = 1
endif