diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-03-02 22:53:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-03-02 22:53:00 +0000 |
| commit | da13032eda69d57277a192d00c54f55c020b0aa6 (patch) | |
| tree | 521b4acb7180929c6150b19170670a33231b643d | |
| parent | 93cc47cae2550b4d7c15e5f3651005119ef8cf7b (diff) | |
fixes for 64 bit OS X build (c/o david robillard); tested on Lion & Tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@11585 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 4 | ||||
| -rw-r--r-- | libs/appleutility/CAComponent.cpp | 4 | ||||
| -rw-r--r-- | libs/ardour/coreaudiosource.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 62592a7e16..e1c8b67986 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -728,7 +728,7 @@ EngineControl::enumerate_coreaudio_devices () // (code snippet gently "borrowed" from St?hane Letz jackdmp;) OSStatus err; Boolean isWritable; - size_t outSize = sizeof(isWritable); + UInt32 outSize = sizeof(isWritable); backend_devs.clear (); @@ -744,7 +744,7 @@ EngineControl::enumerate_coreaudio_devices () if (err == noErr) { // Look for the CoreAudio device name... char coreDeviceName[256]; - size_t nameSize; + UInt32 nameSize; for (int i = 0; i < numCoreDevices; i++) { diff --git a/libs/appleutility/CAComponent.cpp b/libs/appleutility/CAComponent.cpp index 700d9e2b3e..10c253c7f2 100644 --- a/libs/appleutility/CAComponent.cpp +++ b/libs/appleutility/CAComponent.cpp @@ -91,7 +91,7 @@ CAComponent::~CAComponent () OSStatus CAComponent::GetResourceVersion (UInt32 &outVersion) const { bool versionFound = false; - short componentResFileID = kResFileNotOpened; + ResFileRefNum componentResFileID = kResFileNotOpened; OSStatus result; short thngResourceCount; @@ -247,7 +247,7 @@ void _ShowCF (FILE* file, CFStringRef str) void CAComponent::Print(FILE* file) const { - fprintf (file, "CAComponent: 0x%X", int(Comp())); + fprintf (file, "CAComponent: %p", (void*)Comp()); if (mManuName) { fprintf (file, ", Manu:"); _ShowCF (file, mManuName); if (mAUName) fprintf (file, ", Name:"); _ShowCF (file, mAUName); diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc index ef99b9afcf..947c66e756 100644 --- a/libs/ardour/coreaudiosource.cc +++ b/libs/ardour/coreaudiosource.cc @@ -224,7 +224,7 @@ CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&) { FSRef ref; ExtAudioFileRef af = 0; - size_t size; + UInt32 size; CFStringRef name; int ret = -1; diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 3a37073e29..1aabbe760e 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -175,7 +175,7 @@ setup_hardware_optimization (bool try_optimization) } #elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS) - long sysVersion = 0; + SInt32 sysVersion = 0; if (noErr != Gestalt(gestaltSystemVersion, &sysVersion)) sysVersion = 0; |