+1 -1

src/CoreAudio/AFAVFormatComponent/AudioFileFormatGeneric.cpp

reviewed

··· 18 18 */ 19 19 #include "AudioFileFormatGeneric.h" 20 20 #include <cstring> 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 23 23 extern "C" { 24 24 #include <libavformat/avformat.h>

+1 -1

src/CoreAudio/AudioFileTools/Utility/AFToolsCommon.cpp

reviewed

··· 43 43 #include "AFToolsCommon.h" 44 44 #include "CAAudioFileFormats.h" 45 45 #include <ctype.h> 46 46 - #include <CoreServices/Endian.h> 46 46 + #include <CarbonCore/Endian.h> 47 47 48 48 49 49 /*

+1 -1

src/CoreAudio/AudioFileTools/afinfo.cpp

reviewed

··· 53 53 #include <stdio.h> 54 54 #include "CAStreamBasicDescription.h" 55 55 #include <stdlib.h> 56 56 - #include <CoreServices/Endian.h> 56 56 + #include <CarbonCore/Endian.h> 57 57 58 58 //using namespace std; 59 59

+1 -1

src/CoreAudio/AudioToolbox/AUComponent.cpp

reviewed

··· 20 20 21 21 #include <AudioToolbox/AUComponent.h> 22 22 #include <AudioToolbox/AudioOutputUnit.h> 23 23 - #include <CoreServices/MacErrors.h> 23 23 + #include <CarbonCore/MacErrors.h> 24 24 #include "ComponentDispatch.h" 25 25 26 26 const CFStringRef kAudioComponentRegistrationsChangedNotification = CFSTR("AudioComponentRegistrationsChangedNotification");

+4 -4

src/CoreAudio/AudioToolbox/AudioComponent.mm

reviewed

··· 18 18 */ 19 19 20 20 #include <AudioToolbox/AudioComponent.h> 21 21 - #include <CoreServices/Components.h> 22 22 - #include <CoreServices/Resources.h> 23 23 - #include <CoreServices/MacErrors.h> 24 24 - #include <CoreServices/MacMemory.h> 21 21 + #include <CarbonCore/Components.h> 22 22 + #include <CarbonCore/Resources.h> 23 23 + #include <CarbonCore/MacErrors.h> 24 24 + #include <CarbonCore/MacMemory.h> 25 25 #include "AudioComponentManager.h" 26 26 #include <iostream> 27 27

+1 -1

src/CoreAudio/AudioToolbox/AudioComponentManager.mm

reviewed

··· 19 19 #include "AudioComponentManager.h" 20 20 #include <cstdlib> 21 21 #include <CoreFoundation/CoreFoundation.h> 22 22 - #include <CoreServices/MacErrors.h> 22 22 + #include <CarbonCore/MacErrors.h> 23 23 24 24 AudioComponentManager::AudioComponentManager() 25 25 {

+1 -1

src/CoreAudio/AudioToolbox/AudioConverter.cpp

reviewed

··· 19 19 20 20 #include "AudioConverter.h" 21 21 #include "AudioConverterImpl.h" 22 22 - #include <CoreServices/MacErrors.h> 22 22 + #include <CarbonCore/MacErrors.h> 23 23 #include <stdexcept> 24 24 #include <cstring> 25 25

+1 -1

src/CoreAudio/AudioToolbox/AudioConverterImpl.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include "AudioConverterImpl.h" 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include <stdexcept> 23 23 #include <cstring> 24 24 #include <cassert>

+1 -1

src/CoreAudio/AudioToolbox/AudioFile.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include <AudioToolbox/AudioFile.h> 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include "AudioFileFormatManager.h" 23 23 24 24 OSStatus AudioFileCreateWithURL (CFURLRef inFileRef,

+1 -1

src/CoreAudio/AudioToolbox/AudioFileComponent.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include <AudioToolbox/AudioFileComponent.h> 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include "ComponentDispatch.h" 23 23 24 24 OSStatus

+1 -1

src/CoreAudio/AudioToolbox/AudioFormat.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 #include <AudioToolbox/AudioFormat.h> 20 20 - #include <CoreServices/MacErrors.h> 20 20 + #include <CarbonCore/MacErrors.h> 21 21 22 22 OSStatus AudioFormatGetPropertyInfo( AudioFormatPropertyID inPropertyID, 23 23 UInt32 inSpecifierSize,

+1 -1

src/CoreAudio/AudioToolbox/AudioOutputUnitComponent.cpp

reviewed

··· 1 1 #include "AudioOutputUnitComponent.h" 2 2 - #include <CoreServices/MacErrors.h> 2 2 + #include <CarbonCore/MacErrors.h> 3 3 #include <cstring> 4 4 5 5 AudioOutputUnitComponent::AudioOutputUnitComponent()

+1 -1

src/CoreAudio/AudioToolbox/AudioQueue.cpp

reviewed

··· 1 1 #include "AudioQueue.h" 2 2 #include "AudioQueueOutput.h" 3 3 - #include <CoreServices/MacErrors.h> 3 3 + #include <CarbonCore/MacErrors.h> 4 4 5 5 OSStatus AudioQueueStart(AudioQueueRef inAQ, const AudioTimeStamp *inStartTime) 6 6 {

+1 -1

src/CoreAudio/AudioToolbox/AudioQueueBase.cpp

reviewed

··· 1 1 #include "AudioQueueBase.h" 2 2 #include "stub.h" 3 3 - #include <CoreServices/MacErrors.h> 3 3 + #include <CarbonCore/MacErrors.h> 4 4 5 5 AudioQueue::AudioQueue(const AudioStreamBasicDescription* format, void* userData, 6 6 CFRunLoopRef runloop, CFStringRef runloopMode, UInt32 flags)

+1 -1

src/CoreAudio/AudioToolbox/AudioQueueOutput.cpp

reviewed

··· 1 1 #include "AudioQueueOutput.h" 2 2 #include "stub.h" 3 3 - #include <CoreServices/MacErrors.h> 3 3 + #include <CarbonCore/MacErrors.h> 4 4 5 5 AudioQueueOutput::AudioQueueOutput(const AudioStreamBasicDescription *inFormat, 6 6 AudioQueueOutputCallback inCallbackProc,

+1 -1

src/CoreAudio/AudioToolbox/ComponentDispatch.h

reviewed

··· 20 20 #ifndef _COMPONENT_DISPATCH_H 21 21 #define _COMPONENT_DISPATCH_H 22 22 #include "AudioComponentManager.h" 23 23 - #include <CoreServices/Components.h> 23 23 + #include <CarbonCore/Components.h> 24 24 25 25 template <typename First, typename... Rest> 26 26 void assignParams(ComponentParameters* cp, size_t totalArgs, size_t argumentIndex, First arg, Rest... rest)

+1 -1

src/CoreAudio/AudioToolbox/ExtendedAudioFile.cpp

reviewed

··· 19 19 20 20 21 21 #include <AudioToolbox/ExtendedAudioFile.h> 22 22 - #include <CoreServices/MacErrors.h> 22 22 + #include <CarbonCore/MacErrors.h> 23 23 24 24 // TODO: Implement with the help of CAAudioFile? 25 25

+1 -1

src/CoreAudio/AudioToolbox/MusicDevice.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include <AudioToolbox/MusicDevice.h> 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include <iostream> 23 23 24 24 OSStatus

+1 -1

src/CoreAudio/CoreAudio/AudioHardware.cpp

reviewed

··· 22 22 #include "pulse/AudioHardwareImplPA.h" 23 23 #include "pulse/AudioHardwareImplPAOutput.h" 24 24 #include "pulse/AudioHardwareImplPAInput.h" 25 25 - #include <CoreServices/MacErrors.h> 25 25 + #include <CarbonCore/MacErrors.h> 26 26 #include <dispatch/dispatch.h> 27 27 #include <memory> 28 28 #include <unordered_map>

+1 -1

src/CoreAudio/CoreAudio/AudioHardwareImpl.cpp

reviewed

··· 21 21 #include <typeinfo> 22 22 #include <iostream> 23 23 #include <cstring> 24 24 - #include <CoreServices/MacErrors.h> 24 24 + #include <CarbonCore/MacErrors.h> 25 25 26 26 AudioHardwareImpl::AudioHardwareImpl(AudioObjectID myId) 27 27 : m_myId(myId)

+1 -1

src/CoreAudio/CoreAudioUtilityClasses/CoreAudio/AudioUnits/AUPublic/AUBase/ComponentBase.h

reviewed

··· 56 56 #include <AudioUnit/AudioUnit.h> 57 57 58 58 #if !CA_USE_AUDIO_PLUGIN_ONLY 59 59 - #include <CoreServices/Components.h> 59 59 + #include <CarbonCore/Components.h> 60 60 61 61 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) 62 62 #define AudioComponentInstance ComponentInstance

+1 -1

src/CoreAudio/CoreAudioUtilityClasses/CoreAudio/PublicUtility/CAAudioUnit.cpp

reviewed

··· 48 48 49 49 #if !TARGET_OS_IPHONE 50 50 #if !defined(__COREAUDIO_USE_FLAT_INCLUDES__) 51 51 - #include <CoreServices/Components.h> 51 51 + #include <CarbonCore/Components.h> 52 52 #include <dlfcn.h> 53 53 #else 54 54 #include <Components.h>

+4

src/CoreAudio/CoreAudioUtilityClasses/CoreAudio/PublicUtility/CAPersistence.cpp

reviewed

··· 53 53 #include "CAAUParameter.h" 54 54 #include "CAAUMIDIMap.h" 55 55 56 56 + #ifdef DARLING 57 57 + #include <CarbonCore/MacErrors.h> 58 58 + #else 56 59 #include <CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h> 60 60 + #endif 57 61 58 62 #pragma mark __CAStreamBasicDescription 59 63

+1 -1

src/CoreAudio/include/AudioToolbox/AudioToolbox.h

reviewed

··· 15 15 16 16 // CA helper classes expect this 17 17 #include <CoreServices/FileManager.h> 18 18 - #include <CoreServices/Components.h> 18 18 + #include <CarbonCore/Components.h> 19 19 20 20 // OpenAL expects this 21 21 #include <stdlib.h>

+1 -1

src/frameworks/ApplicationServices/HIServices/src/Processes.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include <HIServices/Processes.h> 21 21 - #include <CoreServices/MacErrors.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include <unistd.h> 23 23 #include <signal.h> 24 24 #include <errno.h>

+1 -1

src/frameworks/Carbon/HIToolbox/src/MacWindows.h

reviewed

··· 2 2 #define MACWINDOWS_H 3 3 4 4 #include <X11/Xlib.h> 5 5 - #include "CoreServices/MacErrors.h" 5 5 + #include <CarbonCore/MacErrors.h> 6 6 #include "CoreServices/MacTypes.h" 7 7 #include <stdint.h> 8 8 #include <QD/QD.h>

+1 -1

src/frameworks/Carbon/include/Carbon/Carbon.h

reviewed

··· 21 21 #ifndef _Carbon_H_ 22 22 #define _Carbon_H_ 23 23 24 24 - #include "CoreServices/MacErrors.h" 24 24 + #include <CarbonCore/MacErrors.h> 25 25 #include "CoreServices/MacTypes.h" 26 26 #include "CoreServices/FileManager.h" 27 27

+1 -1

src/frameworks/CoreServices/include/CarbonCore/BackupCore.h

reviewed

··· 22 22 23 23 #include <CoreFoundation/CFBase.h> 24 24 #include <CoreFoundation/CFURL.h> 25 25 - #include <CoreServices/MacErrors.h> 25 25 + #include <CarbonCore/MacErrors.h> 26 26 27 27 #ifdef __cplusplus 28 28 extern "C" {

+17

src/frameworks/CoreServices/include/CarbonCore/CarbonCore.h

reviewed

··· 17 17 #include <CarbonCore/BackupCore.h> 18 18 #endif 19 19 20 20 + #include <CarbonCore/Components.h> 21 21 + #include <CarbonCore/DateTimeUtils.h> 22 22 + #include <CarbonCore/DriverServices.h> 23 23 + #include <CarbonCore/DriverSynchronization.h> 24 24 + #include <CarbonCore/Endian.h> 25 25 + #include <CarbonCore/FixMath.h> 26 26 + #include <CarbonCore/Gestalt.h> 27 27 + #include <CarbonCore/MacErrors.h> 28 28 + #include <CarbonCore/MacMemory.h> 29 29 + #include <CarbonCore/Math64.h> 30 30 + #include <CarbonCore/Multiprocessing.h> 20 31 #include <CarbonCore/MixedMode.h> 32 32 + #include <CarbonCore/TextCommon.h> 33 33 + #include <CarbonCore/TextEncodingConverter.h> 34 34 + #include <CarbonCore/TextUtils.h> 35 35 + #include <CarbonCore/Timer.h> 36 36 + #include <CarbonCore/ToolUtils.h> 37 37 + #include <CarbonCore/UnicodeUtilities.h> 21 38 22 39 #endif

+1 -1

src/frameworks/CoreServices/include/CoreServices/Components.h src/frameworks/CoreServices/include/CarbonCore/Components.h

reviewed

··· 20 20 #ifndef COMPONENTS_H 21 21 #define COMPONENTS_H 22 22 #include <MacTypes.h> 23 23 - #include <CoreServices/Resources.h> 23 23 + #include <CarbonCore/Resources.h> 24 24 25 25 struct ComponentDescription; 26 26 typedef struct ComponentDescription ComponentDescription;

+3 -19

src/frameworks/CoreServices/include/CoreServices/CoreServices.h

reviewed

··· 1 1 #ifndef _CORESERVICES_CORESERVICES_H_ 2 2 #define _CORESERVICES_CORESERVICES_H_ 3 3 4 4 - #include <CoreServices/Components.h> 5 5 - #include <CoreServices/Endian.h> 6 6 - #include <CoreServices/DateTimeUtils.h> 7 7 - #include <CoreServices/DriverServices.h> 8 8 - #include <CoreServices/DriverSynchronization.h> 9 9 - #include <CoreServices/FileManager.h> 10 10 - #include <CoreServices/FixMath.h> 11 11 - #include <CoreServices/Gestalt.h> 12 12 - #include <CoreServices/MacErrors.h> 13 13 - #include <CoreServices/MacMemory.h> 14 4 #include <MacTypes.h> 15 15 - #include <CoreServices/Math64.h> 16 16 - #include <CoreServices/Multiprocessing.h> 5 5 + #include <CoreServices/FileManager.h> 17 6 #include <CoreServices/OpenTransport.h> 18 7 #include <CoreServices/ScriptManager.h> 19 19 - #include <CoreServices/TextUtils.h> 20 20 - #include <CoreServices/Timer.h> 21 21 - #include <CoreServices/ToolUtils.h> 22 8 #include <CoreServices/UniChar.h> 23 23 - #include <CoreServices/UnicodeUtilities.h> 24 24 - #include <CoreServices/TextCommon.h> 25 25 - #include <CoreServices/TextEncodingConverter.h> 26 9 #include <CoreServices/MDItem.h> 27 10 #include <CoreServices/MDQuery.h> 28 11 29 29 - #include <LaunchServices/LaunchServices.h> 30 12 #include <AE/AE.h> 13 13 + #include <CarbonCore/CarbonCore.h> 31 14 #include <FSEvents/FSEvents.h> 15 15 + #include <LaunchServices/LaunchServices.h> 32 16 33 17 #endif 34 18

+1 -1

src/frameworks/CoreServices/include/CoreServices/DateTimeUtils.h src/frameworks/CoreServices/include/CarbonCore/DateTimeUtils.h

reviewed

··· 22 22 #define UTCUTILS_H 23 23 #include <stdint.h> 24 24 #include <time.h> 25 25 + #include <CarbonCore/MacErrors.h> 25 26 #include <CoreFoundation/CFDate.h> 26 26 - #include "MacErrors.h" 27 27 28 28 #define UNIX_OFFSET 2082844800ll // 1970 - 1904 29 29 #define CF_OFFSET 3061152000ll // 2001 - 1904: "Seconds" is since 2001+

src/frameworks/CoreServices/include/CoreServices/Debugging.h src/frameworks/CoreServices/include/CarbonCore/Debugging.h

reviewed

src/frameworks/CoreServices/include/CoreServices/DriverServices.h src/frameworks/CoreServices/include/CarbonCore/DriverServices.h

reviewed

src/frameworks/CoreServices/include/CoreServices/DriverSynchronization.h src/frameworks/CoreServices/include/CarbonCore/DriverSynchronization.h

reviewed

src/frameworks/CoreServices/include/CoreServices/Endian.h src/frameworks/CoreServices/include/CarbonCore/Endian.h

reviewed

+3 -2

src/frameworks/CoreServices/include/CoreServices/FileManager.h

reviewed

··· 22 22 #define FILEMANAGER_H 23 23 #include <stdint.h> 24 24 #include <dirent.h> 25 25 - #include "MacErrors.h" 26 26 - #include "DateTimeUtils.h" 25 25 + 27 26 #include "MacTypes.h" 27 27 + #include <CarbonCore/DateTimeUtils.h> 28 28 + #include <CarbonCore/MacErrors.h> 28 29 #include <CoreFoundation/CFURL.h> 29 30 30 31 #ifdef __cplusplus

src/frameworks/CoreServices/include/CoreServices/Files.h src/frameworks/CoreServices/include/CarbonCore/Files.h

reviewed

src/frameworks/CoreServices/include/CoreServices/FixMath.h src/frameworks/CoreServices/include/CarbonCore/FixMath.h

reviewed

src/frameworks/CoreServices/include/CoreServices/Gestalt.h src/frameworks/CoreServices/include/CarbonCore/Gestalt.h

reviewed

src/frameworks/CoreServices/include/CoreServices/MacErrors.h src/frameworks/CoreServices/include/CarbonCore/MacErrors.h

reviewed

+1 -1

src/frameworks/CoreServices/include/CoreServices/MacLocales.h src/frameworks/CoreServices/include/CarbonCore/MacLocales.h

reviewed

··· 19 19 20 20 #ifndef MACLOCALES_H 21 21 #define MACLOCALES_H 22 22 - #include "MacErrors.h" 23 22 #include <stdint.h> 23 23 + #include <CarbonCore/MacErrors.h> 24 24 25 25 typedef int16_t RegionCode; 26 26 typedef int16_t LangCode;

src/frameworks/CoreServices/include/CoreServices/MacMemory.h src/frameworks/CoreServices/include/CarbonCore/MacMemory.h

reviewed

src/frameworks/CoreServices/include/CoreServices/Math64.h src/frameworks/CoreServices/include/CarbonCore/Math64.h

reviewed

src/frameworks/CoreServices/include/CoreServices/Multiprocessing.h src/frameworks/CoreServices/include/CarbonCore/Multiprocessing.h

reviewed

+1 -1

src/frameworks/CoreServices/include/CoreServices/Resources.h src/frameworks/CoreServices/include/CarbonCore/Resources.h

reviewed

··· 20 20 21 21 #ifndef _CS_RESOURCES_H 22 22 #define _CS_RESOURCES_H 23 23 + #include <CarbonCore/Files.h> 23 24 #include <CoreServices/MacTypes.h> 24 24 - #include <CoreServices/Files.h> 25 25 #include <CoreServices/FileManager.h> 26 26 27 27 #ifdef __cplusplus

src/frameworks/CoreServices/include/CoreServices/TextCommon.h src/frameworks/CoreServices/include/CarbonCore/TextCommon.h

reviewed

src/frameworks/CoreServices/include/CoreServices/TextEncodingConverter.h src/frameworks/CoreServices/include/CarbonCore/TextEncodingConverter.h

reviewed

src/frameworks/CoreServices/include/CoreServices/TextUtils.h src/frameworks/CoreServices/include/CarbonCore/TextUtils.h

reviewed

src/frameworks/CoreServices/include/CoreServices/Timer.h src/frameworks/CoreServices/include/CarbonCore/Timer.h

reviewed

src/frameworks/CoreServices/include/CoreServices/ToolUtils.h src/frameworks/CoreServices/include/CarbonCore/ToolUtils.h

reviewed

src/frameworks/CoreServices/include/CoreServices/UnicodeUtilities.h src/frameworks/CoreServices/include/CarbonCore/UnicodeUtilities.h

reviewed

+3 -3

src/frameworks/CoreServices/src/CarbonCore/ComponentManager.cpp

reviewed

··· 18 18 */ 19 19 20 20 #include "ComponentManager.h" 21 21 - #include <CoreServices/MacErrors.h> 22 22 - #include <CoreServices/Resources.h> 23 23 - #include <CoreServices/MacMemory.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 + #include <CarbonCore/Resources.h> 23 23 + #include <CarbonCore/MacMemory.h> 24 24 #include <dirent.h> 25 25 #include <cstdlib> 26 26 #include <CoreFoundation/CFBundle.h>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/ComponentManager.h

reviewed

··· 19 19 20 20 #ifndef _CS_COMPONENT_MANAGER_H 21 21 #define _CS_COMPONENT_MANAGER_H 22 22 - #include <CoreServices/Components.h> 22 22 + #include <CarbonCore/Components.h> 23 23 #include <unordered_map> 24 24 #include <mutex> 25 25 #include <memory>

+3 -3

src/frameworks/CoreServices/src/CarbonCore/Components.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Components.h> 21 21 - #include <CoreServices/MacErrors.h> 22 22 - #include <CoreServices/MacMemory.h> 20 20 + #include <CarbonCore/Components.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 + #include <CarbonCore/MacMemory.h> 23 23 #include "ComponentManager.h" 24 24 25 25 Component FindNextComponent(Component prev, ComponentDescription* desc)

+2 -2

src/frameworks/CoreServices/src/CarbonCore/CoreEndian.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Endian.h> 20 20 + #include <CarbonCore/Endian.h> 21 21 #include <stdint.h> 22 22 #include <map> 23 23 #include <TargetConditionals.h> 24 24 - #include <CoreServices/MacErrors.h> 24 24 + #include <CarbonCore/MacErrors.h> 25 25 #include <mutex> 26 26 27 27 static std::map<

+1 -1

src/frameworks/CoreServices/src/CarbonCore/DateTimeUtils.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/DateTimeUtils.h> 20 20 + #include <CarbonCore/DateTimeUtils.h> 21 21 #include <climits> 22 22 #include <ctime> 23 23

+1 -1

src/frameworks/CoreServices/src/CarbonCore/Debugging.cpp

reviewed

··· 16 16 You should have received a copy of the GNU General Public License 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 - #include <CoreServices/Debugging.h> 19 19 + #include <CarbonCore/Debugging.h> 20 20 #include <iostream> 21 21 #include <sstream> 22 22 #include <algorithm>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/DriverServices.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/DriverServices.h> 20 20 + #include <CarbonCore/DriverServices.h> 21 21 #include "time.h" 22 22 #include <sys/sysctl.h> 23 23 #include <sys/time.h>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/DriverSynchronization.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/DriverSynchronization.h> 20 20 + #include <CarbonCore/DriverSynchronization.h> 21 21 22 22 23 23 Boolean CompareAndSwap(UInt32 old, UInt32 _new, UInt32* ptr)

+1 -1

src/frameworks/CoreServices/src/CarbonCore/FileManager.cpp

reviewed

··· 36 36 #include <regex.h> 37 37 #include <fcntl.h> 38 38 #include <vector> 39 39 - #include <CoreServices/DateTimeUtils.h> 39 39 + #include <CarbonCore/DateTimeUtils.h> 40 40 #include <errno.h> 41 41 #include <ext/file_handle.h> 42 42

+2 -2

src/frameworks/CoreServices/src/CarbonCore/Files.cpp

reviewed

··· 16 16 You should have received a copy of the GNU General Public License 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 - #include <CoreServices/Files.h> 20 20 - #include <CoreServices/MacErrors.h> 19 19 + #include <CarbonCore/Files.h> 20 20 + #include <CarbonCore/MacErrors.h> 21 21 22 22 OSErr FSGetDataForkName(HFSUniStr255* dataForkName) 23 23 {

+1 -1

src/frameworks/CoreServices/src/CarbonCore/FixMath.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/FixMath.h> 20 20 + #include <CarbonCore/FixMath.h> 21 21 #include <cmath> 22 22 #include <limits> 23 23

+2 -2

src/frameworks/CoreServices/src/CarbonCore/Gestalt.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/MacErrors.h> 20 20 + #include <CarbonCore/MacErrors.h> 21 21 #include <cstring> 22 22 #include <cstdio> 23 23 #include <sys/sysctl.h> 24 24 - #include <CoreServices/Gestalt.h> 24 24 + #include <CarbonCore/Gestalt.h> 25 25 26 26 OSStatus Gestalt(uint32_t type, int* value) 27 27 {

+1 -1

src/frameworks/CoreServices/src/CarbonCore/MacErrors.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/MacErrors.h> 20 20 + #include <CarbonCore/MacErrors.h> 21 21 #include <iostream> 22 22 #include "UserBreak.h" 23 23

+2 -2

src/frameworks/CoreServices/src/CarbonCore/MacLocales.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/MacLocales.h> 21 21 - #include <CoreServices/MacErrors.h> 20 20 + #include <CarbonCore/MacLocales.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include <unicode/locid.h> 23 23 #include <unicode/coll.h> 24 24 #include <cstring>

+2 -2

src/frameworks/CoreServices/src/CarbonCore/MacMemory.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/MacMemory.h> 21 21 - #include <CoreServices/MacErrors.h> 20 20 + #include <CarbonCore/MacMemory.h> 21 21 + #include <CarbonCore/MacErrors.h> 22 22 #include <cstring> 23 23 #include <stdint.h> 24 24 #include <cstdlib>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/Math64.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Math64.h> 20 20 + #include <CarbonCore/Math64.h> 21 21 #include <limits> 22 22 23 23 int64_t S64Max()

+2 -2

src/frameworks/CoreServices/src/CarbonCore/Multiprocessing.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Multiprocessing.h> 20 20 + #include <CarbonCore/Multiprocessing.h> 21 21 #include <unistd.h> 22 22 #include <ctime> 23 23 #include <pthread.h> 24 24 - #include <CoreServices/MacErrors.h> 24 24 + #include <CarbonCore/MacErrors.h> 25 25 26 26 Boolean _MPIsFullyInitialized() 27 27 {

+1 -1

src/frameworks/CoreServices/src/CarbonCore/Resources.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Resources.h> 20 20 + #include <CarbonCore/Resources.h> 21 21 #include <unordered_map> 22 22 #include <mutex> 23 23 #include <limits>

+2 -2

src/frameworks/CoreServices/src/CarbonCore/ResourcesImpl.h

reviewed

··· 19 19 20 20 #ifndef _CS_RESOURCES_IMPL_H 21 21 #define _CS_RESOURCES_IMPL_H 22 22 - #include <CoreServices/Resources.h> 23 23 - #include <CoreServices/MacMemory.h> 22 22 + #include <CarbonCore/Resources.h> 23 23 + #include <CarbonCore/MacMemory.h> 24 24 #include <string> 25 25 #include <stdint.h> 26 26 #include <vector>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/TextCommon.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/TextCommon.h> 20 20 + #include <CarbonCore/TextCommon.h> 21 21 22 22 TextEncoding CreateTextEncoding(TextEncodingBase encodingBase, TextEncodingVariant encodingVariant, TextEncodingFormat encodingFormat) 23 23 {

+2 -2

src/frameworks/CoreServices/src/CarbonCore/TextEncodingConverter.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/TextEncodingConverter.h> 20 20 + #include <CarbonCore/TextEncodingConverter.h> 21 21 #include <unicode/ucnv.h> 22 22 #include <unicode/normalizer2.h> 23 23 - #include <CoreServices/MacErrors.h> 23 23 + #include <CarbonCore/MacErrors.h> 24 24 25 25 struct OpaqueTECObjectRef 26 26 {

+1 -1

src/frameworks/CoreServices/src/CarbonCore/TextUtils.cpp

reviewed

··· 18 18 */ 19 19 20 20 21 21 - #include <CoreServices/TextUtils.h> 21 21 + #include <CarbonCore/TextUtils.h> 22 22 #include <cstring> 23 23 #include <cstdlib> 24 24 #include <algorithm>

+1 -1

src/frameworks/CoreServices/src/CarbonCore/Timer.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/Timer.h> 20 20 + #include <CarbonCore/Timer.h> 21 21 #include <mach/mach_time.h> 22 22 #include <stdint.h> 23 23

+1 -1

src/frameworks/CoreServices/src/CarbonCore/ToolUtils.cpp

reviewed

··· 17 17 along with Darling. If not, see <http://www.gnu.org/licenses/>. 18 18 */ 19 19 20 20 - #include <CoreServices/ToolUtils.h> 20 20 + #include <CarbonCore/ToolUtils.h> 21 21 22 22 23 23 int BitTst(const void* bytePtr, long bitNum)

+2 -2

src/frameworks/CoreServices/src/CarbonCore/UnicodeUtilities.cpp

reviewed

··· 18 18 */ 19 19 20 20 21 21 - #include <CoreServices/UnicodeUtilities.h> 21 21 + #include <CarbonCore/UnicodeUtilities.h> 22 22 #include <unicode/coll.h> 23 23 #include <unicode/sortkey.h> 24 24 #include <string> 25 25 #include <cstring> 26 26 #include <iostream> 27 27 #include <CoreServices/UniChar.h> 28 28 - #include <CoreServices/MacErrors.h> 28 28 + #include <CarbonCore/MacErrors.h> 29 29 30 30 using namespace icu; 31 31

+1 -1

src/frameworks/CoreServices/src/LaunchServices/LSInfo.m

reviewed

··· 19 19 20 20 21 21 #include <LaunchServices/LaunchServices.h> 22 22 - #include <CoreServices/MacErrors.h> 22 22 + #include <CarbonCore/MacErrors.h> 23 23 #include <stdio.h> 24 24 #include <sqlite3.h> 25 25 #import <Foundation/NSString.h>

+1 -1

src/frameworks/CoreServices/src/LaunchServices/LSOpen.m

reviewed

··· 19 19 20 20 21 21 #include <LaunchServices/LaunchServices.h> 22 22 - #include <CoreServices/MacErrors.h> 22 22 + #include <CarbonCore/MacErrors.h> 23 23 #include <stdio.h> 24 24 25 25 OSStatus

+2 -1

src/frameworks/CoreServices/src/LaunchServices/LSRunning.m

reviewed

··· 24 24 #include <CoreFoundation/CFPriv.h> 25 25 #include <CoreFoundation/CFBundlePriv.h> 26 26 #include <CoreFoundation/CFDate.h> 27 27 - #include <CoreServices/MacErrors.h> 27 27 + #include <CoreFoundation/CFXPCBridge.h> 28 28 + #include <CarbonCore/MacErrors.h> 28 29 #include <dispatch/dispatch.h> 29 30 #include <stdlib.h> 30 31 #include <stdio.h>

+1 -1

src/frameworks/CoreServices/src/LaunchServices/LaunchServices.cpp

reviewed

··· 1 1 #include <LaunchServices/LaunchServices.h> 2 2 #include <LaunchServices/LaunchServicesPriv.h> 3 3 - #include <CoreServices/MacErrors.h> 3 3 + #include <CarbonCore/MacErrors.h> 4 4 #include <unistd.h> 5 5 #include <string> 6 6 #include <memory>