dyld-851.27.tar.gz

[apple/dyld.git] / src / ImageLoaderMegaDylib.cpp

diff --git a/src/ImageLoaderMegaDylib.cpp b/src/ImageLoaderMegaDylib.cpp
index b14af260f1ca9b867c9d6d5ed2f09a11215ad6da..5978ac38ad062b9b346cad4da09f9c561d9510cc 100644 (file)
--- a/src/ImageLoaderMegaDylib.cpp
+++ b/src/ImageLoaderMegaDylib.cpp
@@ -196,7 +196,7 @@ bool ImageLoaderMegaDylib::hasDylib(const char* path, unsigned* index) const
 {
        const uint8_t* imageNode = ImageLoader::trieWalk(_dylibsTrieStart, _dylibsTrieEnd, path);
        if ( imageNode == NULL ) {
-  #if __MAC_OS_X_VERSION_MIN_REQUIRED
+  #if TARGET_OS_OSX
                // not all symlinks are recorded as aliases in accelerator tables
                if ( (strncmp(path, "/usr/lib/", 9) == 0) || (strncmp(path, "/System/Library/", 16) == 0) ) {
                        char resolvedPath[PATH_MAX];
@@ -518,7 +518,7 @@ void ImageLoaderMegaDylib::appendImagesNeedingCoalescing(ImageLoader* images[],
 }
 
 
-bool ImageLoaderMegaDylib::weakSymbolsBound(unsigned index)
+bool ImageLoaderMegaDylib::weakSymbolsBound(unsigned index) const
 {
        return ( _stateFlags[index] >= kStateFlagWeakBound );
 }
@@ -573,7 +573,7 @@ void ImageLoaderMegaDylib::recursiveLoadLibraries(const LinkContext& context, bo
        recursiveMarkLoaded(context, index);
 }
 
-unsigned int ImageLoaderMegaDylib::recursiveUpdateDepth(unsigned int maxDepth)
+unsigned int ImageLoaderMegaDylib::updateDepth(unsigned int maxDepth)
 {
        setDepth(maxDepth);
        return maxDepth;
@@ -946,7 +946,7 @@ void ImageLoaderMegaDylib::recursiveInitialization(const LinkContext& context, m
        }
 }
 
-void ImageLoaderMegaDylib::recursiveBind(const LinkContext& context, bool forceLazysBound, bool neverUnload)
+void ImageLoaderMegaDylib::recursiveBind(const LinkContext& context, bool forceLazysBound, bool neverUnload, const ImageLoader* parent)
 {
        markAllbound(context);
 }