CF-635.15.tar.gz

[apple/cf.git] / CFPlugIn_Factory.c

diff --git a/CFPlugIn_Factory.c b/CFPlugIn_Factory.c
index c30e7f9be84d541f085e409b3e0da2277e5b870f..1777b47d3c7d58d3589761cf3c4d6e6221771701 100644 (file)
--- a/CFPlugIn_Factory.c
+++ b/CFPlugIn_Factory.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2011 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -20,9 +20,10 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
+
 /*     CFPlugIn_Factory.c
-       Copyright (c) 1999-2009, Apple Inc.  All rights reserved.
-       Responsibility: Doug Davidson
+       Copyright (c) 1999-2011, Apple Inc.  All rights reserved.
+        Responsibility: David Smith
 */
 
 #include "CFBundle_Internal.h"
@@ -138,12 +139,6 @@ __private_extern__ void *_CFPFactoryCreateInstance(CFAllocatorRef allocator, _CF
         if (!factory->_func) {
             factory->_func = (CFPlugInFactoryFunction)CFBundleGetFunctionPointerForName(factory->_plugIn, factory->_funcName);
             if (!factory->_func) CFLog(__kCFLogPlugIn, CFSTR("Cannot find function pointer %@ for factory %@ in %@"), factory->_funcName, factory->_uuid, factory->_plugIn);
-#if BINARY_SUPPORT_CFM
-            if (factory->_func) {
-                // return values from CFBundleGetFunctionPointerForName will always be dyld, but we must force-fault them because pointers to glue code do not fault correctly
-                factory->_func = (void *)((uint32_t)(factory->_func) | 0x1);
-            }
-#endif /* BINARY_SUPPORT_CFM */
         }
         if (factory->_func) {
             // UPPGOOP