diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/appleutility/CAComponent.cpp | 4 | ||||
| -rw-r--r-- | libs/ardour/coreaudiosource.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 2 |
3 files changed, 4 insertions, 4 deletions
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; |