Permalink
Browse files

Merge remaining Linux updates, plus Mac OS X fixes.

git-svn-id: https://opencflite.svn.sourceforge.net/svnroot/opencflite@20 949b7c4e-b822-e185-8c53-f993a654f32e
  • Loading branch information...
1 parent ab58a6c commit 9f41d36eeeed1a7552b30d6567a208d31dba8bc6 bfulgham committed Feb 4, 2009
Showing with 7,362 additions and 2,611 deletions.
  1. +1 −1 BuildCFLite
  2. +2 −2 BuildCFLite.windows
  3. +10 −0 CFApplicationPreferences.c
  4. +10 −0 CFArray.c
  5. +10 −0 CFArray.h
  6. +10 −0 CFBag.c
  7. +10 −0 CFBag.h
  8. +21 −2 CFBase.c
  9. +11 −0 CFBase.h
  10. +10 −0 CFBinaryHeap.c
  11. +10 −0 CFBinaryHeap.h
  12. +10 −0 CFBinaryPList.c
  13. +10 −0 CFBitVector.c
  14. +10 −0 CFBitVector.h
  15. +10 −0 CFBuiltinConverters.c
  16. +24 −4 CFBundle.c
  17. +10 −0 CFBundle.h
  18. +10 −0 CFBundlePriv.h
  19. +10 −0 CFBundle_BinaryTypes.h
  20. +10 −0 CFBundle_Internal.h
  21. +10 −0 CFBundle_Resources.c
  22. +10 −0 CFByteOrder.h
  23. +10 −0 CFCalendar.c
  24. +10 −0 CFCalendar.h
  25. +10 −0 CFCharacterSet.c
  26. +10 −0 CFCharacterSet.h
  27. +10 −0 CFCharacterSetPriv.h
  28. +10 −0 CFConcreteStreams.c
  29. +10 −0 CFData.c
  30. +10 −0 CFData.h
  31. +10 −0 CFDate.c
  32. +10 −0 CFDate.h
  33. +10 −0 CFDateFormatter.c
  34. +10 −0 CFDateFormatter.h
  35. +10 −0 CFDictionary.c
  36. +10 −0 CFDictionary.h
  37. +10 −0 CFError.c
  38. +10 −0 CFError.h
  39. +10 −0 CFError_Private.h
  40. +13 −2 CFFileUtilities.c
  41. +73 −2 CFInternal.h
  42. +5 −3 CFLite/CFLite.xcodeproj/project.pbxproj
  43. +10 −0 CFLocale.c
  44. +10 −0 CFLocale.h
  45. +10 −0 CFLocaleIdentifier.c
  46. +10 −0 CFLogUtilities.h
  47. +10 −0 CFMachPort.c
  48. +10 −0 CFMachPort.h
  49. +10 −0 CFMessagePort.c
  50. +10 −0 CFMessagePort.h
  51. +12 −7 CFNumber.c
  52. +10 −0 CFNumber.h
  53. +10 −0 CFNumberFormatter.c
  54. +10 −0 CFNumberFormatter.h
  55. +15 −3 CFPlatform.c
  56. +10 −0 CFPlugIn.c
  57. +10 −0 CFPlugIn.h
  58. +10 −0 CFPlugInCOM.h
  59. +10 −0 CFPlugIn_Factory.c
  60. +10 −0 CFPlugIn_Factory.h
  61. +10 −0 CFPlugIn_Instance.c
  62. +10 −0 CFPlugIn_PlugIn.c
  63. +10 −0 CFPreferences.c
  64. +10 −0 CFPreferences.h
  65. +10 −0 CFPriv.h
  66. +10 −0 CFPropertyList.c
  67. +10 −0 CFPropertyList.h
  68. +69 −39 CFRunLoop.c
  69. +10 −0 CFRunLoop.h
  70. +10 −0 CFRunLoopPriv.h
  71. +18 −16 CFRuntime.c
  72. +10 −0 CFRuntime.h
  73. +10 −0 CFSet.c
  74. +10 −0 CFSet.h
  75. +11 −1 CFSocket.c
  76. +10 −0 CFSocket.h
  77. +10 −0 CFSocketStream.c
  78. +10 −0 CFSortFunctions.c
  79. +12 −8 CFStorage.c
  80. +10 −0 CFStorage.h
  81. +10 −0 CFStream.c
  82. +10 −0 CFStream.h
  83. +10 −0 CFStreamAbstract.h
  84. +10 −0 CFStreamInternal.h
  85. +10 −0 CFStreamPriv.h
  86. +10 −0 CFString.c
  87. +10 −0 CFString.h
  88. +14 −4 CFStringDefaultEncoding.h
  89. +10 −0 CFStringEncodingConverter.c
  90. +10 −0 CFStringEncodingConverter.h
  91. +10 −0 CFStringEncodingConverterExt.h
  92. +10 −0 CFStringEncodingConverterPriv.h
  93. +11 −0 CFStringEncodingExt.h
  94. +10 −0 CFStringEncodings.c
  95. +10 −0 CFStringScanner.c
  96. +10 −0 CFStringUtilities.c
  97. +11 −1 CFSystemDirectories.c
  98. +10 −0 CFTimeZone.c
  99. +10 −0 CFTimeZone.h
  100. +10 −0 CFTree.c
  101. +10 −0 CFTree.h
  102. +10 −0 CFURL.c
  103. +10 −0 CFURL.h
  104. +14 −1 CFURLAccess.c
  105. +10 −0 CFURLAccess.h
  106. +10 −0 CFUUID.c
  107. +10 −0 CFUUID.h
  108. +10 −0 CFUniChar.c
  109. +10 −0 CFUniChar.h
  110. +10 −0 CFUniCharPriv.h
  111. +10 −0 CFUnicodeDecomposition.c
  112. +10 −0 CFUnicodeDecomposition.h
  113. +10 −0 CFUnicodePrecomposition.c
  114. +10 −0 CFUnicodePrecomposition.h
  115. +10 −0 CFUserNotification.c
  116. +10 −0 CFUserNotification.h
  117. +16 −3 CFUtilities.c
  118. +10 −0 CFVersion.c
  119. +10 −0 CFXMLInputStream.c
  120. +10 −0 CFXMLInputStream.h
  121. +10 −0 CFXMLNode.c
  122. +10 −0 CFXMLNode.h
  123. +10 −0 CFXMLParser.c
  124. +10 −0 CFXMLParser.h
  125. +10 −0 CFXMLPreferencesDomain.c
  126. +10 −0 CFXMLTree.c
  127. +10 −0 CoreFoundation.h
  128. +10 −0 ForFoundationOnly.h
  129. +367 −0 LICENSE
  130. +2,936 −2 Makefile
  131. +297 −138 Makefile.am
  132. +1,718 −2,317 Makefile.in
  133. +10 −0 auto_stubs.h
  134. +494 −32 configure
  135. +49 −23 configure.ac
  136. +13 −0 examples/ReadPListExample/ReadPListExample.cpp
  137. +11 −0 examples/WritePListExample/WritePListExample.cpp
  138. +24 −0 m4/acinclude.m4
View
@@ -23,7 +23,7 @@ PRIVATE_HEADERS="CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtil
OBJBASE=../CF-Objects
ARCHFLAGS="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
-CFLAGS="-c -pipe -std=gnu99 -g -Wmost -Wno-trigraphs -mmacosx-version-min=10.5 -fconstant-cfstrings -fexceptions -DCF_BUILDING_CF=1 -DDEPLOYMENT_TARGET_MACOSX=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -DU_SHOW_DRAFT_API=1 -I$OBJBASE -I. -I./include/mach_support -DVERSION=476.15"
+CFLAGS="-c -pipe -std=gnu99 -g -Wmost -Wno-trigraphs -mmacosx-version-min=10.5 -fconstant-cfstrings -fexceptions -DCF_BUILDING_CF=1 -DDEPLOYMENT_TARGET_MACOSX=1 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -DU_SHOW_DRAFT_API=1 -I$OBJBASE -I. -I./include/mach_support -DVERSION=476.17"
LFLAGS="-dynamiclib -mmacosx-version-min=10.5 -twolevel_namespace -init ___CFInitialize -compatibility_version 150 -current_version 476 -sectcreate __UNICODE __csbitmaps CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data $UNICODE_DATA_FILE -segprot __UNICODE r r"
/bin/rm -rf $OBJBASE
View
@@ -32,7 +32,7 @@ PRIVATE_HEADERS="CFBundlePriv.h CFCharacterSetPriv.h CFError_Private.h CFLogUtil
OBJBASE=../CF-Objects
#ARCHFLAGS="-arch ppc -arch ppc64 -arch i386 -arch x86_64"
ARCHFLAGS=""
-CFLAGS="-c -pipe -std=gnu99 -g $WARNINGS -Wno-trigraphs $MACOSVERS -fexceptions -DCF_BUILDING_CF=1 $DEPLOYMENT_TARGET -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -DU_SHOW_DRAFT_API=1 -I. -I./Compatability -I$OBJBASE -DVERSION=476.15 -DWINVER=0x0500 -D_WIN32_WINNT=0x0501"
+CFLAGS="-c -pipe -std=gnu99 -g $WARNINGS -Wno-trigraphs $MACOSVERS -fexceptions -DCF_BUILDING_CF=1 $DEPLOYMENT_TARGET -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5 -DU_SHOW_DRAFT_API=1 -I. -I./Compatability -I$OBJBASE -DVERSION=476.17 -DWINVER=0x0500 -D_WIN32_WINNT=0x0501"
# LFLAGS="-dynamiclib -mmacosx-version-min=10.5 -twolevel_namespace -init ___CFInitialize -compatibility_version 150 -current_version 476 -sectcreate __UNICODE __csbitmaps CFCharacterSetBitmaps.bitmap -sectcreate __UNICODE __properties CFUniCharPropertyDatabase.data -sectcreate __UNICODE __data $UNICODE_DATA_FILE -segprot __UNICODE r r"
LFLAGS="-lmsvcrt -lnetapi32 -lobjc -lole32 -lws2_32 -lkernel32 -lrpcrt4"
@@ -58,7 +58,7 @@ Build () {
done
echo "Linking $STYLE ..."
echo $CC $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS -licuuc -licuin -lobjc -o $OBJBASE/CoreFoundation_$STYLE
- $CC -shared $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS lib/icuuc.lib lib/icuin.lib -lobjc -o $OBJBASE/libCFlite_476_15.dll
+ $CC -shared $STYLE_LFLAGS $ARCHFLAGS $OBJBASE/$STYLE/*.o $LFLAGS lib/icuuc.lib lib/icuin.lib -lobjc -o $OBJBASE/libCFlite_476_17.dll
if [ $? -ne 0 ]; then
echo "*** Linking $STYLE failed ***"
exit 1
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
10 CFBag.c
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
10 CFBag.h
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,15 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ * Copyright (c) 2009 Grant Erickson <gerickson@nuovations.com>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
@@ -1015,10 +1026,14 @@ __asm__ (
" .align 2\n"
#if DEPLOYMENT_TARGET_MACOSX
".private_extern ___HALT\n"
+"___HALT:\n"
+#elif DEPLOYMENT_TARGET_LINUX
+".globl __HALT\n"
+"__HALT:\n"
#else
".globl ___HALT\n"
-#endif
"___HALT:\n"
+#endif
" trap\n"
);
#endif
@@ -1034,10 +1049,14 @@ __asm__ (
" .align 2, 0x90\n"
#if DEPLOYMENT_TARGET_MACOSX
".private_extern ___HALT\n"
+"___HALT:\n"
+#elif DEPLOYMENT_TARGET_LINUX
+".globl __HALT\n"
+"__HALT:\n"
#else
".globl ___HALT\n"
-#endif
"___HALT:\n"
+#endif
" int3\n"
);
#endif
View
@@ -1,4 +1,15 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ * Copyright (c) 2009 Grant Erickson <gerickson@nuovations.com>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,15 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ * Copyright (c) 2009 Grant Erickson <gerickson@nuovations.com>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
@@ -54,9 +65,14 @@
#if defined(BINARY_SUPPORT_DLFCN)
#include <dlfcn.h>
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_SOLARIS
+#define CF_RTLD_FIRST RTLD_FIRST
+#else
+#define CF_RTLD_FIRST 0
+#endif /* DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_SOLARIS */
#endif /* BINARY_SUPPORT_DLFCN */
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
#include <fcntl.h>
#endif
@@ -3771,7 +3787,7 @@ __private_extern__ Boolean _CFBundleDlfcnCheckLoaded(CFBundleRef bundle) {
char buff[CFMaxPathSize];
if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) {
- int mode = RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD | RTLD_FIRST;
+ int mode = RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD | CF_RTLD_FIRST;
void *handle = dlopen(buff, mode);
if (handle) {
if (!bundle->_handleCookie) {
@@ -3818,7 +3834,11 @@ extern Boolean _CFBundleDlfcnPreflight(CFBundleRef bundle, CFErrorRef *error) {
retval = false;
if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) {
+#if DEPLOYMENT_TARGET_MACOSX && (MAC_OS_X_VERSION_10_5 <= MAC_OS_X_VERSION_MAX_ALLOWED)
retval = dlopen_preflight(buff);
+#else
+ retval = false;
+#endif /* DEPLOYMENT_TARGET_MACOSX && (MAC_OS_X_VERSION_10_5 <= MAC_OS_X_VERSION_MAX_ALLOWED) */
if (!retval && error) {
CFArrayRef archs = CFBundleCopyExecutableArchitectures(bundle);
CFStringRef debugString = NULL;
@@ -3867,7 +3887,7 @@ __private_extern__ Boolean _CFBundleDlfcnLoadBundle(CFBundleRef bundle, Boolean
CFURLRef executableURL = CFBundleCopyExecutableURL(bundle);
char buff[CFMaxPathSize];
if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) {
- int mode = forceGlobal ? (RTLD_LAZY | RTLD_GLOBAL | RTLD_FIRST) : (RTLD_NOW | RTLD_LOCAL | RTLD_FIRST);
+ int mode = forceGlobal ? (RTLD_LAZY | RTLD_GLOBAL | CF_RTLD_FIRST) : (RTLD_NOW | RTLD_LOCAL | CF_RTLD_FIRST);
bundle->_handleCookie = dlopen(buff, mode);
#if LOG_BUNDLE_LOAD
printf("dlfcn load bundle %p, dlopen of %s mode 0x%x returns handle %p\n", bundle, buff, mode, bundle->_handleCookie);
@@ -3902,7 +3922,7 @@ __private_extern__ Boolean _CFBundleDlfcnLoadFramework(CFBundleRef bundle, CFErr
CFURLRef executableURL = CFBundleCopyExecutableURL(bundle);
char buff[CFMaxPathSize];
if (executableURL && CFURLGetFileSystemRepresentation(executableURL, true, (uint8_t *)buff, CFMaxPathSize)) {
- int mode = RTLD_LAZY | RTLD_GLOBAL | RTLD_FIRST;
+ int mode = RTLD_LAZY | RTLD_GLOBAL | CF_RTLD_FIRST;
bundle->_handleCookie = dlopen(buff, mode);
#if LOG_BUNDLE_LOAD
printf("dlfcn load framework %p, dlopen of %s mode 0x%x returns handle %p\n", bundle, buff, mode, bundle->_handleCookie);
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
View
@@ -1,4 +1,14 @@
/*
+ * Copyright (c) 2008-2009 Brent Fulgham <bfulgham@gmail.org>. All rights reserved.
+ *
+ * This source code is a modified version of the CoreFoundation sources released by Apple Inc. under
+ * the terms of the APSL version 2.0 (see below).
+ *
+ * For information about changes from the original Apple source release can be found by reviewing the
+ * source control system for the project at https://sourceforge.net/svn/?group_id=246198.
+ *
+ * The original license information is as follows:
+ *
* Copyright (c) 2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
Oops, something went wrong.

0 comments on commit 9f41d36

Please sign in to comment.