CF-368.28.tar.gz

[apple/cf.git] / PlugIn.subproj / CFBundle_Internal.h

diff --git a/PlugIn.subproj/CFBundle_Internal.h b/PlugIn.subproj/CFBundle_Internal.h
index 1c8fb0965ea8e01670aaf1e308fda413de702f8c..3f6be1f9be08a2a7c041641906a1c56935ede5f7 100644 (file)
--- a/PlugIn.subproj/CFBundle_Internal.h
+++ b/PlugIn.subproj/CFBundle_Internal.h
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -23,7 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 /*     CFBundle_Internal.h
  * @APPLE_LICENSE_HEADER_END@
  */
 /*     CFBundle_Internal.h

-       Copyright (c) 1999-2003, Apple, Inc. All rights reserved.
+       Copyright (c) 1999-2005, Apple, Inc. All rights reserved.

 */
 
 #if !defined(__COREFOUNDATION_CFBUNDLE_INTERNAL__)
 */
 
 #if !defined(__COREFOUNDATION_CFBUNDLE_INTERNAL__)


@@ -116,19 +114,18 @@ extern CFArrayRef _CFBundleDYLDCopyLoadedImagePathsIfChanged(void);
 extern CFArrayRef _CFBundleDYLDCopyLoadedImagePathsForHint(CFStringRef hint);
 #endif
 
 extern CFArrayRef _CFBundleDYLDCopyLoadedImagePathsForHint(CFStringRef hint);
 #endif
 

-#if defined(BINARY_SUPPORT_CFM)
+#if defined(BINARY_SUPPORT_CFM) && defined(__ppc__)

 // CFM API
 #if defined(__MACOS8__)
 #include <CodeFragments.h>
 #else
 // CFM API
 #if defined(__MACOS8__)
 #include <CodeFragments.h>
 #else

-#include <CarbonCore/CodeFragments.h>

 #endif
 extern Boolean _CFBundleCFMLoad(CFBundleRef bundle);
 extern void _CFBundleCFMConnect(CFBundleRef bundle);
 extern void _CFBundleCFMUnload(CFBundleRef bundle);
 extern void *__CFBundleCFMGetSymbol(void *connID, ConstStr255Param name, CFragSymbolClass class);
 extern void *_CFBundleCFMGetSymbolByName(CFBundleRef bundle, CFStringRef symbolName, CFragSymbolClass class);
 #endif
 extern Boolean _CFBundleCFMLoad(CFBundleRef bundle);
 extern void _CFBundleCFMConnect(CFBundleRef bundle);
 extern void _CFBundleCFMUnload(CFBundleRef bundle);
 extern void *__CFBundleCFMGetSymbol(void *connID, ConstStr255Param name, CFragSymbolClass class);
 extern void *_CFBundleCFMGetSymbolByName(CFBundleRef bundle, CFStringRef symbolName, CFragSymbolClass class);

-#endif /* BINARY_SUPPORT_CFM */
+#endif /* BINARY_SUPPORT_CFM && __ppc__ */

 
 #if defined(BINARY_SUPPORT_DLL)
 extern Boolean _CFBundleDLLLoad(CFBundleRef bundle);
 
 #if defined(BINARY_SUPPORT_DLL)
 extern Boolean _CFBundleDLLLoad(CFBundleRef bundle);


@@ -139,7 +136,9 @@ extern void *_CFBundleDLLGetSymbolByName(CFBundleRef bundle, CFStringRef symbolN
 
 /* Private PlugIn-related CFBundle API */
 
 
 /* Private PlugIn-related CFBundle API */
 

+extern Boolean _CFBundleNeedsInitPlugIn(CFBundleRef bundle);

 extern void _CFBundleInitPlugIn(CFBundleRef bundle);
 extern void _CFBundleInitPlugIn(CFBundleRef bundle);

+extern void _CFBundlePlugInLoaded(CFBundleRef bundle);

 extern void _CFBundleDeallocatePlugIn(CFBundleRef bundle);
 
 extern void _CFPlugInWillUnload(CFPlugInRef plugIn);
 extern void _CFBundleDeallocatePlugIn(CFBundleRef bundle);
 
 extern void _CFPlugInWillUnload(CFPlugInRef plugIn);


@@ -196,6 +195,7 @@ extern void _CFPlugInRemoveFactory(CFPlugInRef plugIn, _CFPFactory *factory);
 #define _CFBundleAlternateBuiltInPlugInsURLFromBase2 CFSTR("Contents/Plug-ins/")
 
 #define _CFBundleLprojExtension CFSTR("lproj")
 #define _CFBundleAlternateBuiltInPlugInsURLFromBase2 CFSTR("Contents/Plug-ins/")
 
 #define _CFBundleLprojExtension CFSTR("lproj")

+#define _CFBundleLprojExtensionWithDot CFSTR(".lproj")

 
 #define _CFBundleMacOSXPlatformName CFSTR("macos")
 #define _CFBundleAlternateMacOSXPlatformName CFSTR("macosx")
 
 #define _CFBundleMacOSXPlatformName CFSTR("macos")
 #define _CFBundleAlternateMacOSXPlatformName CFSTR("macosx")