SF.net SVN: alleg: [7611] allegro/branches/4.3/src/macosx

[<tj...@us...>]

Revision: 7611
          http://svn.sourceforge.net/alleg/?rev=7611&view=rev
Author:   tjaden
Date:     2006-11-30 01:13:18 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
Merge in two small changes in the MacOS X port from 4.2 to 4.3.

Modified Paths:
--------------
    allegro/branches/4.3/src/macosx/cadigi.m
    allegro/branches/4.3/src/macosx/hidman.m

Modified: allegro/branches/4.3/src/macosx/cadigi.m
===================================================================
--- allegro/branches/4.3/src/macosx/cadigi.m	2006-11-29 17:23:31 UTC (rev 7610)
+++ allegro/branches/4.3/src/macosx/cadigi.m	2006-11-30 09:13:18 UTC (rev 7611)
@@ -169,10 +169,10 @@
    
    input_format_desc.mSampleRate = output_format_desc.mSampleRate;
    input_format_desc.mFormatID = kAudioFormatLinearPCM;
-#if TARGET_RT_BIG_ENDIAN
+#ifdef ALLEGRO_BIG_ENDIAN
    input_format_desc.mFormatFlags = kAudioFormatFlagIsBigEndian | kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
 #else
-   input_format_desc.mFormatFlags =  kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
+   input_format_desc.mFormatFlags = kAudioFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
 #endif
    input_format_desc.mBytesPerPacket = 4;
    input_format_desc.mFramesPerPacket = 1;

Modified: allegro/branches/4.3/src/macosx/hidman.m
===================================================================
--- allegro/branches/4.3/src/macosx/hidman.m	2006-11-29 17:23:31 UTC (rev 7610)
+++ allegro/branches/4.3/src/macosx/hidman.m	2006-11-30 09:13:18 UTC (rev 7611)
@@ -378,7 +378,7 @@
       result = IOServiceGetMatchingServices(master_port, class_dictionary, &hid_object_iterator);
       if ((result == kIOReturnSuccess) && (hid_object_iterator)) {
          /* Ok, we have a list of attached HID devices; scan them. */
-         while ((hid_device = IOIteratorNext(hid_object_iterator))!=NULL) {
+         while ((hid_device = IOIteratorNext(hid_object_iterator))!=0) {
             if ((IORegistryEntryCreateCFProperties(hid_device, &properties, kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS) && (properties != NULL)) {
                error = FALSE;
                this_device = add_device(col);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.